Skip to content

Commit e823c64

Browse files
committed
Set output names for libcxx shared libraries
Although building shared libraries is not enabled, CMake still creates targets for them, and implicitly changes them to static. In order to prevent this duplication of library targets, this patch explicitly sets the output names for shared libraries to something different.
1 parent 18b561e commit e823c64

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ function(
12491249
-DLIBCXXABI_USE_COMPILER_RT=ON
12501250
-DLIBCXXABI_USE_LLVM_UNWINDER=ON
12511251
-DLIBCXXABI_TEST_PARAMS=executor=${test_executor}
1252+
-DLIBCXXABI_SHARED_OUTPUT_NAME="c++abi-shared"
12521253
-DLIBCXX_ABI_UNSTABLE=ON
12531254
-DLIBCXX_CXX_ABI=libcxxabi
12541255
-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON
@@ -1257,12 +1258,14 @@ function(
12571258
-DLIBCXX_ENABLE_STATIC=ON
12581259
-DLIBCXX_INCLUDE_BENCHMARKS=OFF
12591260
-DLIBCXX_TEST_PARAMS=executor=${test_executor}
1261+
-DLIBCXX_SHARED_OUTPUT_NAME="c++-shared"
12601262
-DLIBUNWIND_ENABLE_SHARED=OFF
12611263
-DLIBUNWIND_ENABLE_STATIC=ON
12621264
-DLIBUNWIND_IS_BAREMETAL=ON
12631265
-DLIBUNWIND_REMEMBER_HEAP_ALLOC=ON
12641266
-DLIBUNWIND_USE_COMPILER_RT=ON
12651267
-DLIBUNWIND_TEST_PARAMS=executor=${test_executor}
1268+
-DLIBUNWIND_SHARED_OUTPUT_NAME="unwind-shared"
12661269
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
12671270
-DLLVM_ENABLE_RUNTIMES=libcxxabi,libcxx,libunwind
12681271
-DRUNTIME_TEST_ARCH_FLAGS=${flags}

0 commit comments

Comments
 (0)