[PATCH] D46609: [CMake] Build shared version of ASan and UBSan for Fuchsia

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added reviewers: vitalybuka, morehouse, mcgrathr.
Herald added subscribers: Sanitizers, llvm-commits, mgorny, kubamracek.

Fuchsia is no longer treated as UNIX which means we need to explicitly
enable building of shared versions of ASan and UBSan.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D46609

Files:
  compiler-rt/lib/asan/CMakeLists.txt
  compiler-rt/lib/ubsan/CMakeLists.txt
  compiler-rt/lib/ubsan_minimal/CMakeLists.txt


Index: compiler-rt/lib/ubsan_minimal/CMakeLists.txt
===================================================================
--- compiler-rt/lib/ubsan_minimal/CMakeLists.txt
+++ compiler-rt/lib/ubsan_minimal/CMakeLists.txt
@@ -44,7 +44,7 @@
     LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
     PARENT_TARGET ubsan-minimal)
 
-  if (UNIX AND NOT APPLE)
+  if ((FUCHSIA OR UNIX) AND NOT APPLE)
     set(ARCHS_FOR_SYMBOLS ${UBSAN_SUPPORTED_ARCH})
     list(REMOVE_ITEM ARCHS_FOR_SYMBOLS i386 i686)
     add_sanitizer_rt_symbols(clang_rt.ubsan_minimal
Index: compiler-rt/lib/ubsan/CMakeLists.txt
===================================================================
--- compiler-rt/lib/ubsan/CMakeLists.txt
+++ compiler-rt/lib/ubsan/CMakeLists.txt
@@ -173,7 +173,7 @@
       CFLAGS ${UBSAN_CXXFLAGS}
       PARENT_TARGET ubsan)
 
-    if (UNIX)
+    if (FUCHSIA OR UNIX)
       add_compiler_rt_runtime(clang_rt.ubsan_standalone
         SHARED
         ARCHS ${UBSAN_SUPPORTED_ARCH}
Index: compiler-rt/lib/asan/CMakeLists.txt
===================================================================
--- compiler-rt/lib/asan/CMakeLists.txt
+++ compiler-rt/lib/asan/CMakeLists.txt
@@ -227,7 +227,7 @@
       DEFS ${ASAN_DYNAMIC_DEFINITIONS}
       PARENT_TARGET asan)
 
-    if (UNIX AND NOT ${arch} STREQUAL "i386")
+    if ((FUCHSIA OR UNIX) AND NOT ${arch} STREQUAL "i386")
       add_sanitizer_rt_symbols(clang_rt.asan_cxx
         ARCHS ${arch})
       add_dependencies(asan clang_rt.asan_cxx-${arch}-symbols)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46609.145809.patch
Type: text/x-patch
Size: 1486 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180508/673257ce/attachment.bin>