diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-07-17 14:46:59 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-07-17 14:46:59 +0200 |
| commit | 6b96b8612e482c05265f73913c6449104c2ce6e9 (patch) | |
| tree | a8ff62da69c3e3aa065d9fd758ecc3004457c55c | |
| parent | dab95e8297ce1ddedcd64b57606ad03bfa36dce7 (diff) | |
Stop linking with libstdc++fs
| -rw-r--r-- | build_settings.cmake | 4 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 63535062c9b..d0bb50360da 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -54,20 +54,16 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(VESPA_ATOMIC_LIB "") set(VESPA_GCC_LIB "") - set(VESPA_STDCXX_FS_LIB "") else() if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) set(VESPA_GCC_LIB "gcc") - set(VESPA_STDCXX_FS_LIB "stdc++fs") else() set(VESPA_GCC_LIB "") - set(VESPA_STDCXX_FS_LIB "") endif() endif() else() set(CXX_SPECIFIC_WARN_OPTS "-Wnoexcept -Wsuggest-override -Wnon-virtual-dtor -Wformat-security -Wmismatched-tags") set(VESPA_GCC_LIB "gcc") - set(VESPA_STDCXX_FS_LIB "stdc++fs") endif() # Detect uring shared library. diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt index 7bb1c9b878c..d4de8e578bd 100644 --- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt @@ -29,6 +29,4 @@ vespa_add_library(searchcore_pcommon STATIC statusreport.cpp DEPENDS searchcore_proton_metrics - EXTERNAL_DEPENDS - ${VESPA_STDCXX_FS_LIB} ) diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt index 0f36ab4e834..f5544ed1b15 100644 --- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt @@ -126,6 +126,4 @@ vespa_add_library(searchcore_server STATIC searchcore_summaryengine searchcore_reference configdefinitions - EXTERNAL_DEPENDS - ${VESPA_STDCXX_FS_LIB} ) |