[clang] ceb76d2 - [CMake][Fuchsia] Move runtimes to outer scope

Petr Hosek via cfe-commits cfe-commits at lists.llvm.org
Thu Jul 9 21:09:24 PDT 2020


Author: Petr Hosek
Date: 2020-07-09T21:07:44-07:00
New Revision: ceb76d2fe73d39f2230bf55d47b8fd68849d47d7

URL: https://github.com/llvm/llvm-project/commit/ceb76d2fe73d39f2230bf55d47b8fd68849d47d7
DIFF: https://github.com/llvm/llvm-project/commit/ceb76d2fe73d39f2230bf55d47b8fd68849d47d7.diff

LOG: [CMake][Fuchsia] Move runtimes to outer scope

This is needed for runtimes to be properly configured, addressing an
issue introduced in 53e38c85.

Added: 
    

Modified: 
    clang/cmake/caches/Fuchsia-stage2.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 4d9b8526d0c4..259684ff2b0d 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -5,6 +5,7 @@ set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64;RISCV CACHE STRING "")
 set(PACKAGE_VENDOR Fuchsia CACHE STRING "")
 
 set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld;llvm" CACHE STRING "")
+set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
 
 set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
 if(NOT APPLE)
@@ -70,7 +71,6 @@ if(APPLE)
   set(DARWIN_iossim_ARCHS i386;x86_64 CACHE STRING "")
   set(DARWIN_osx_ARCHS x86_64 CACHE STRING "")
   set(SANITIZER_MIN_OSX_VERSION 10.7 CACHE STRING "")
-  set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
 endif()
 
 if(WIN32)


        


More information about the cfe-commits mailing list