[test-suite] r287194 - cmake: Do not use ARCH variable before it is set

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Wed Nov 16 18:19:42 PST 2016


Author: matze
Date: Wed Nov 16 20:19:41 2016
New Revision: 287194

URL: http://llvm.org/viewvc/llvm-project?rev=287194&view=rev
Log:
cmake: Do not use ARCH variable before it is set

... otherwise the rule will work for people with a cmake cache present,
but fail on the first run.

Modified:
    test-suite/trunk/CMakeLists.txt

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=287194&r1=287193&r2=287194&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Wed Nov 16 20:19:41 2016
@@ -34,18 +34,6 @@ endif()
 # We want reproducible builds, so using __DATE__ and __TIME__ is bad
 add_definitions(-Werror=date-time)
 
-# Disabling address space randomization makes the performance of memory/cache
-# intensive benchmarks more deterministic.
-set(TEST_SUITE_DISABLE_PIE "True" CACHE BOOL
-    "Disable position independent executables and ASLR")
-mark_as_advanced(TEST_SUITE_DISABLE_PIE)
-if(TEST_SUITE_DISABLE_PIE)
-  if(APPLE AND NOT ARCH STREQUAL "AArch64")
-    list(APPEND LDFLAGS -Wl,-no_pie)
-  endif()
-  # TODO: Add apropriate flags to disable PIE/ASLR on linux, bsd, ...
-endif()
-
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
@@ -139,6 +127,18 @@ if(NOT DEFINED ENDIAN)
   endif()
 endif()
 
+# Disabling address space randomization makes the performance of memory/cache
+# intensive benchmarks more deterministic.
+set(TEST_SUITE_DISABLE_PIE "True" CACHE BOOL
+    "Disable position independent executables and ASLR")
+mark_as_advanced(TEST_SUITE_DISABLE_PIE)
+if(TEST_SUITE_DISABLE_PIE)
+  if(APPLE AND NOT ARCH STREQUAL "AArch64")
+    list(APPEND LDFLAGS -Wl,-no_pie)
+  endif()
+  # TODO: Add apropriate flags to disable PIE/ASLR on linux, bsd, ...
+endif()
+
 if(ARCH STREQUAL "Mips")
   check_symbol_exists(__mips16 "" MIPS_IS_MIPS16_ENABLED)
   check_symbol_exists(__mips64 "" MIPS_IS_MIPS64_ENABLED)




More information about the llvm-commits mailing list