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

Phabricator via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 16 12:40:47 PST 2019


This revision was automatically updated to reflect the committed changes.
Closed by commit rCRT351373: compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac (authored by nico, committed by ).
Herald added a subscriber: Sanitizers.

Repository:
  rCRT Compiler Runtime

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D56800/new/

https://reviews.llvm.org/D56800

Files:
  test/cfi/CMakeLists.txt
  test/safestack/CMakeLists.txt


Index: test/safestack/CMakeLists.txt
===================================================================
--- test/safestack/CMakeLists.txt
+++ test/safestack/CMakeLists.txt
@@ -6,15 +6,17 @@
   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()
 
Index: test/cfi/CMakeLists.txt
===================================================================
--- test/cfi/CMakeLists.txt
+++ test/cfi/CMakeLists.txt
@@ -74,15 +74,17 @@
     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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56800.182122.patch
Type: text/x-patch
Size: 1416 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190116/974fafe2/attachment.bin>


More information about the llvm-commits mailing list