From bbe509920721cf5d42990339e4daf43e27073ec4 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 30 Jul 2020 10:27:36 +0200 Subject: [PATCH] [compiler-rt][cmake] Simplify COMPILER_RT_HAS_VERSION_SCRIPT tests As requested in the review, this patch removes the additional conditions in the `COMPILER_RT_HAS_VERSION_SCRIPT` tests. Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`. Differential Revision: https://reviews.llvm.org/D84559 --- compiler-rt/lib/asan/CMakeLists.txt | 2 +- compiler-rt/lib/ubsan/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 0c29893..41e889e 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -224,7 +224,7 @@ else() PARENT_TARGET asan) foreach(arch ${ASAN_SUPPORTED_ARCH}) - if (UNIX AND COMPILER_RT_HAS_VERSION_SCRIPT) + if (COMPILER_RT_HAS_VERSION_SCRIPT) add_sanitizer_rt_version_list(clang_rt.asan-dynamic-${arch} LIBS clang_rt.asan-${arch} clang_rt.asan_cxx-${arch} EXTRA asan.syms.extra) diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt index 00b74a6..b5342f2 100644 --- a/compiler-rt/lib/ubsan/CMakeLists.txt +++ b/compiler-rt/lib/ubsan/CMakeLists.txt @@ -200,7 +200,7 @@ else() CFLAGS ${UBSAN_CXXFLAGS} PARENT_TARGET ubsan) - if ((FUCHSIA OR UNIX) AND COMPILER_RT_HAS_VERSION_SCRIPT) + if (COMPILER_RT_HAS_VERSION_SCRIPT) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "") add_compiler_rt_object_libraries(RTUbsan_dynamic_version_script_dummy ARCHS ${UBSAN_SUPPORTED_ARCH} -- 2.7.4