File tree Expand file tree Collapse file tree 3 files changed +1
-7
lines changed Expand file tree Collapse file tree 3 files changed +1
-7
lines changed Original file line number Diff line number Diff line change @@ -76,7 +76,6 @@ target_include_directories(PULSAR_OBJECT_LIB PUBLIC
7676 "${CMAKE_SOURCE_DIR} /include"
7777 "${CMAKE_BINARY_DIR} /include" )
7878
79- option (LINK_STATIC_GCC_CXX "Link statically to libgcc and libstdc++" OFF )
8079include (CheckCXXSymbolExists)
8180if (BUILD_DYNAMIC_LIB)
8281 add_library (pulsarShared SHARED $<TARGET_OBJECTS:PULSAR_OBJECT_LIB>)
@@ -94,10 +93,6 @@ if (BUILD_DYNAMIC_LIB)
9493 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
9594 target_link_options (pulsarShared PRIVATE -Wl,-Bsymbolic)
9695 endif ()
97- check_cxx_symbol_exists(__GLIBCXX__ iostream GLIBCXX)
98- if (GLIBCXX AND LINK_STATIC_GCC_CXX)
99- target_link_libraries (pulsarShared PUBLIC -static -libgcc -static -libstdc++)
100- endif ()
10196endif ()
10297
10398check_cxx_symbol_exists(getauxval sys/auxv.h HAVE_AUXV_GETAUXVAL)
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ pushd $CPP_DIR
4141export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
4242
4343chmod +x $( find . -name " *.sh" )
44- cmake . -DBUILD_TESTS=OFF -DBUILD_PERF_TOOLS=OFF -DLINK_STATIC=ON -DLINK_STATIC_GCC_CXX=ON
44+ cmake . -DBUILD_TESTS=OFF -DBUILD_PERF_TOOLS=OFF -DLINK_STATIC=ON
4545make -j 3
4646popd
4747
Original file line number Diff line number Diff line change @@ -55,7 +55,6 @@ static library.
5555%build
5656git clone https://github.com/microsoft/vcpkg.git
5757cmake -B build -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release \
58- -DLINK_STATIC_GCC_CXX=ON \
5958 -DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON
6059cmake --build build -j8
6160./build-support/merge_archives_vcpkg.sh $PWD /build
You can’t perform that action at this time.
0 commit comments