[PATCH] D58794: [scudo][standalone] Fix tests makefile

[Kostya Kortchinsky via Phabricator via llvm-commits]

cryptoad created this revision.
cryptoad added reviewers: vitalybuka, eugenis, brzycki.
Herald added subscribers: Sanitizers, delcypher, mgorny.
Herald added projects: LLVM, Sanitizers.

A missing `STATIC` entailed some annoying to debug failures wrt 32 vs 64
binaries. Additionally I noticed I was using the wrong variable (the Scudo
one as opposed to the Scudo Standalone one).

See https://reviews.llvm.org/D58184#1412417 and below for discussion.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D58794

Files:
  lib/scudo/standalone/tests/CMakeLists.txt


Index: lib/scudo/standalone/tests/CMakeLists.txt
===================================================================
--- lib/scudo/standalone/tests/CMakeLists.txt
+++ lib/scudo/standalone/tests/CMakeLists.txt
@@ -12,7 +12,7 @@
   -I${COMPILER_RT_SOURCE_DIR}/lib/scudo/standalone
   -DGTEST_HAS_RTTI=0)
 
-set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH})
+set(SCUDO_TEST_ARCH ${SCUDO_STANDALONE_SUPPORTED_ARCH})
 
 # gtests requires c++
 set(LINK_FLAGS)
@@ -34,7 +34,7 @@
   if(COMPILER_RT_HAS_SCUDO_STANDALONE)
     foreach(arch ${SCUDO_TEST_ARCH})
       set(ScudoUnitTestsObjects)
-      add_library("RTScudoStandalone.test.${arch}"
+      add_library("RTScudoStandalone.test.${arch}" STATIC
         $<TARGET_OBJECTS:RTScudoStandalone.${arch}>)
       generate_compiler_rt_tests(ScudoUnitTestsObjects ScudoUnitTests
         "${testname}-${arch}-Test" ${arch}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58794.188787.patch
Type: text/x-patch
Size: 859 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190228/0afda651/attachment.bin>