Skip to content

Commit 704350a

Browse files
committed
[don't add compiler-rt dir to .conf when using LDC_INSTALL_LLVM_RUNTIME_LIBS=ON]
1 parent 3d427b2 commit 704350a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -900,10 +900,14 @@ endif()
900900
# If everything else if insufficient, the user can specify
901901
# -DCOMPILER_RT_LIBDIR_CONFIG to embed an arbitrary value.
902902
if(NOT DEFINED COMPILER_RT_LIBDIR_CONFIG)
903-
set(COMPILER_RT_LIBDIR_CONFIG "${COMPILER_RT_LIBDIR}")
903+
if(NOT LDC_INSTALL_LLVM_RUNTIME_LIBS)
904+
set(COMPILER_RT_LIBDIR_CONFIG "${COMPILER_RT_LIBDIR}")
905+
endif()
906+
endif()
907+
if(DEFINED COMPILER_RT_LIBDIR_CONFIG)
908+
message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
909+
set(OPTIONAL_COMPILER_RT_DIR "\n \"${COMPILER_RT_LIBDIR_CONFIG}\", // compiler-rt directory")
904910
endif()
905-
message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
906-
set(OPTIONAL_COMPILER_RT_DIR "\n \"${COMPILER_RT_LIBDIR_CONFIG}\", // compiler-rt directory")
907911

908912
#
909913
# Auxiliary build and test utils.

0 commit comments

Comments
 (0)