diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-03-25 00:42:25 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-03-25 00:42:25 +0000 |
| commit | 7218fa55e35c76ef0947cb0e9261696dc11e168d (patch) | |
| tree | ea887bcd2e31b3b19d2a429804e7857b07daabc5 /test | |
| parent | a2065a768c13a5c30a5b7058f4c315bfdc9eeba4 (diff) | |
Fix sanitizer tests with LLVM_TOOL_LLD_BUILD=OFF.
Only depend on LLD if it is going to be built.
Re-land of r298174 which got reverted in r298287.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@298753 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/asan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/cfi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/lit.common.configured.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt index fb1478e7a..4b4fdf19d 100644 --- a/test/asan/CMakeLists.txt +++ b/test/asan/CMakeLists.txt @@ -22,7 +22,7 @@ endmacro() set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND ASAN_TEST_DEPS asan) - if(WIN32 AND COMPILER_RT_HAS_LLD_SOURCES) + if(WIN32 AND COMPILER_RT_HAS_LLD) list(APPEND ASAN_TEST_DEPS lld ) diff --git a/test/cfi/CMakeLists.txt b/test/cfi/CMakeLists.txt index bd51eacb6..c3123a820 100644 --- a/test/cfi/CMakeLists.txt +++ b/test/cfi/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) LTO ) endif() - if(WIN32 AND COMPILER_RT_HAS_LLD_SOURCES) + if(WIN32 AND COMPILER_RT_HAS_LLD) list(APPEND CFI_TEST_DEPS lld ) diff --git a/test/lit.common.configured.in b/test/lit.common.configured.in index 862d06bf2..387f4d4a7 100644 --- a/test/lit.common.configured.in +++ b/test/lit.common.configured.in @@ -26,7 +26,7 @@ set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@) set_default("compiler_rt_libdir", "@COMPILER_RT_LIBRARY_OUTPUT_DIR@") set_default("emulator", "@COMPILER_RT_EMULATOR@") set_default("sanitizer_can_use_cxxabi", @SANITIZER_CAN_USE_CXXABI_PYBOOL@) -set_default("has_lld", @COMPILER_RT_HAS_LLD_SOURCES_PYBOOL@) +set_default("has_lld", @COMPILER_RT_HAS_LLD_PYBOOL@) set_default("can_symbolize", @CAN_SYMBOLIZE@) config.available_features.add('target-is-%s' % config.target_arch) |