[compiler-rt] 10b1864 - [compiler-rt] Do not add -rpath to linker args on Windows

Alex Richardson via llvm-commits llvm-commits at lists.llvm.org
Sun Apr 7 10:22:20 PDT 2024


Author: Alex Richardson
Date: 2024-04-07T10:22:06-07:00
New Revision: 10b1864dff816174cd83fb2d3bc622e25fcf0f8a

URL: https://github.com/llvm/llvm-project/commit/10b1864dff816174cd83fb2d3bc622e25fcf0f8a
DIFF: https://github.com/llvm/llvm-project/commit/10b1864dff816174cd83fb2d3bc622e25fcf0f8a.diff

LOG: [compiler-rt] Do not add -rpath to linker args on Windows

This is not supported. Should hopefully fix Windows CI after
commit c91254db1dcace869f4d3f1ac659bdd7700a1459.

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index af374edb76a83d..8649507ce1c79b 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -602,7 +602,9 @@ if (COMPILER_RT_TEST_STANDALONE_BUILD_LIBS)
     list(APPEND COMPILER_RT_UNITTEST_LINK_FLAGS "-resource-dir=${COMPILER_RT_OUTPUT_DIR}")
   endif()
   get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} rtlib_dir)
-  list(APPEND COMPILER_RT_UNITTEST_LINK_FLAGS "-Wl,-rpath,${rtlib_dir}")
+  if (NOT WIN32)
+    list(APPEND COMPILER_RT_UNITTEST_LINK_FLAGS "-Wl,-rpath,${rtlib_dir}")
+  endif()
 endif()
 
 if(COMPILER_RT_USE_LLVM_UNWINDER)


        


More information about the llvm-commits mailing list