phosek updated this revision to Diff 109852.
Repository:
rL LLVM
https://reviews.llvm.org/D36349
Files:
cmake/caches/Fuchsia-stage2.cmake
Index: cmake/caches/Fuchsia-stage2.cmake
===================================================================
--- cmake/caches/Fuchsia-stage2.cmake
+++ cmake/caches/Fuchsia-stage2.cmake
@@ -36,7 +36,7 @@
list(APPEND LLVM_BUILTIN_TARGETS "default")
endif()
-set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia" CACHE STRING
"")
+set(LLVM_RUNTIME_TARGETS
"default;x86_64-fuchsia;aarch64-fuchsia;x86_64-fuchsia-asan:x86_64-fuchsia;aarch64-fuchsia-asan:aarch64-fuchsia"
CACHE STRING "")
foreach(target x86_64;aarch64)
set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL
"")
set(RUNTIMES_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT}
CACHE PATH "")
@@ -53,6 +53,24 @@
set(RUNTIMES_${target}-fuchsia_SANITIZER_USE_COMPILER_RT ON CACHE BOOL "")
endforeach()
+foreach(target x86_64;aarch64)
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSROOT
${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING
"")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_USE_SANITIZER Address CACHE STRING
"")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_BUILD_COMPILER_RT OFF CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_RUNTIMES_PREFIX
"${target}-fuchsia/asan" CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_UNIX 1 CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL
"")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL
"")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE
BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL
"")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ABI_VERSION 2 CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
+endforeach()
+
# Setup toolchain.
set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "")
set(LLVM_TOOLCHAIN_TOOLS
Index: cmake/caches/Fuchsia-stage2.cmake
===================================================================
--- cmake/caches/Fuchsia-stage2.cmake
+++ cmake/caches/Fuchsia-stage2.cmake
@@ -36,7 +36,7 @@
list(APPEND LLVM_BUILTIN_TARGETS "default")
endif()
-set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia" CACHE STRING "")
+set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia;x86_64-fuchsia-asan:x86_64-fuchsia;aarch64-fuchsia-asan:aarch64-fuchsia" CACHE STRING "")
foreach(target x86_64;aarch64)
set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
@@ -53,6 +53,24 @@
set(RUNTIMES_${target}-fuchsia_SANITIZER_USE_COMPILER_RT ON CACHE BOOL "")
endforeach()
+foreach(target x86_64;aarch64)
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
+ set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_USE_SANITIZER Address CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_BUILD_COMPILER_RT OFF CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_RUNTIMES_PREFIX "${target}-fuchsia/asan" CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_UNIX 1 CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ABI_VERSION 2 CACHE STRING "")
+ set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
+endforeach()
+
# Setup toolchain.
set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "")
set(LLVM_TOOLCHAIN_TOOLS
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
