[compiler-rt] r351373 - compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 16 12:36:27 PST 2019


Author: nico
Date: Wed Jan 16 12:36:27 2019
New Revision: 351373

URL: http://llvm.org/viewvc/llvm-project?rev=351373&view=rev
Log:
compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac

The LTO target doesn't exist with LLVM_ENABLE_PIC turned off.

Differential Revision: https://reviews.llvm.org/D56800

Modified:
    compiler-rt/trunk/test/cfi/CMakeLists.txt
    compiler-rt/trunk/test/safestack/CMakeLists.txt

Modified: compiler-rt/trunk/test/cfi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/CMakeLists.txt?rev=351373&r1=351372&r2=351373&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/cfi/CMakeLists.txt Wed Jan 16 12:36:27 2019
@@ -74,15 +74,17 @@ if(NOT COMPILER_RT_STANDALONE_BUILD)
     opt
     sanstats
   )
-  if(LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR)
-    list(APPEND CFI_TEST_DEPS
-      LLVMgold
-    )
-  endif()
-  if(APPLE)
-    list(APPEND CFI_TEST_DEPS
-      LTO
-    )
+  if(LLVM_ENABLE_PIC)
+    if(LLVM_BINUTILS_INCDIR)
+      list(APPEND CFI_TEST_DEPS
+        LLVMgold
+      )
+    endif()
+    if(APPLE)
+      list(APPEND CFI_TEST_DEPS
+        LTO
+      )
+    endif()
   endif()
   if(NOT APPLE AND COMPILER_RT_HAS_LLD)
     list(APPEND CFI_TEST_DEPS

Modified: compiler-rt/trunk/test/safestack/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/safestack/CMakeLists.txt?rev=351373&r1=351372&r2=351373&view=diff
==============================================================================
--- compiler-rt/trunk/test/safestack/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/safestack/CMakeLists.txt Wed Jan 16 12:36:27 2019
@@ -6,15 +6,17 @@ if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND SAFESTACK_TEST_DEPS safestack)
 
   # Some tests require LTO, so add a dependency on the relevant LTO plugin.
-  if(LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR)
-    list(APPEND SAFESTACK_TEST_DEPS
-      LLVMgold
-    )
-  endif()
-  if(APPLE)
-    list(APPEND SAFESTACK_TEST_DEPS
-      LTO
-    )
+  if(LLVM_ENABLE_PIC)
+    if(LLVM_BINUTILS_INCDIR)
+      list(APPEND SAFESTACK_TEST_DEPS
+        LLVMgold
+      )
+    endif()
+    if(APPLE)
+      list(APPEND SAFESTACK_TEST_DEPS
+        LTO
+      )
+    endif()
   endif()
 endif()
 




More information about the llvm-commits mailing list