Skip to content

Commit

Permalink
remove libunwind (#55)
Browse files Browse the repository at this point in the history
  • Loading branch information
morningman authored and imay committed Aug 29, 2017
1 parent 029c0bf commit 74f08f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 1 addition & 5 deletions be/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ set_target_properties(pprof PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/l
add_library(tcmalloc STATIC IMPORTED)
set_target_properties(tcmalloc PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libtcmalloc.a)

add_library(unwind STATIC IMPORTED)
set_target_properties(unwind PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libunwind.a)

add_library(protobuf STATIC IMPORTED)
set_target_properties(protobuf PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libprotobuf.a)

Expand Down Expand Up @@ -358,7 +355,6 @@ set (PALO_LINK_LIBS ${PALO_LINK_LIBS}
re2
pprof
tcmalloc
unwind
lz4
libevent
${LIBZ}
Expand All @@ -379,7 +375,7 @@ set (PALO_LINK_LIBS ${PALO_LINK_LIBS}
set (TEST_LINK_LIBS ${PALO_LINK_LIBS} gmock LLVMSupport)

# Set CXX flags
SET(CXX_COMMON_FLAGS "-msse4.2 -Wall -Wno-sign-compare -Wno-deprecated -pthread")
SET(CXX_COMMON_FLAGS "-msse4.2 -Wall -Wno-sign-compare -Wno-deprecated -pthread -fno-omit-frame-pointer")
SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -D__STDC_FORMAT_MACROS")

# Add by zhaochun: use gnu++11 for make_unsigned<__int128>
Expand Down
5 changes: 2 additions & 3 deletions thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,7 @@ build_gperftools() {
LDFLAGS="-L${TP_LIB_DIR}" \
LD_LIBRARY_PATH="${TP_LIB_DIR}" \
CFLAGS="-fPIC" \
LIBS="-lunwind" \
./configure --prefix=$TP_INSTALL_DIR --enable-libunwind --with-pic
./configure --prefix=$TP_INSTALL_DIR --disable-libunwind --with-pic
make -j$PARALLEL && make install
}

Expand Down Expand Up @@ -464,7 +463,7 @@ build_glog
build_gtest
build_rapidjson
build_snappy
build_libunwind
# build_libunwind // deprecated
build_gperftools
build_curl
build_re2
Expand Down

0 comments on commit 74f08f1

Please sign in to comment.