This revision was automatically updated to reflect the committed changes. Closed by commit rC330855: [CMake] Enable libc++ for Fuchsia toolchain on Darwin (authored by phosek, committed by ).
Changed prior to commit: https://reviews.llvm.org/D46075?vs=143970&id=143974#toc Repository: rC Clang https://reviews.llvm.org/D46075 Files: cmake/caches/Fuchsia-stage2.cmake Index: cmake/caches/Fuchsia-stage2.cmake =================================================================== --- cmake/caches/Fuchsia-stage2.cmake +++ cmake/caches/Fuchsia-stage2.cmake @@ -38,16 +38,7 @@ set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia;x86_64-fuchsia-asan:x86_64-fuchsia;aarch64-fuchsia-asan:aarch64-fuchsia" CACHE STRING "") # Set the default target runtimes options. -if(APPLE) - # Disable installing libc++, libc++abi or libunwind on Darwin, since Clang - # driver doesn't know how to use libraries that are part of the toolchain. - set(LIBUNWIND_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "") - set(LIBCXXABI_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "") - set(LIBCXX_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBCXX_INSTALL_LIBRARY OFF CACHE BOOL "") -else() +if(NOT APPLE) set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "") set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "")
Index: cmake/caches/Fuchsia-stage2.cmake =================================================================== --- cmake/caches/Fuchsia-stage2.cmake +++ cmake/caches/Fuchsia-stage2.cmake @@ -38,16 +38,7 @@ set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia;x86_64-fuchsia-asan:x86_64-fuchsia;aarch64-fuchsia-asan:aarch64-fuchsia" CACHE STRING "") # Set the default target runtimes options. -if(APPLE) - # Disable installing libc++, libc++abi or libunwind on Darwin, since Clang - # driver doesn't know how to use libraries that are part of the toolchain. - set(LIBUNWIND_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "") - set(LIBCXXABI_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "") - set(LIBCXX_INSTALL_HEADERS OFF CACHE BOOL "") - set(LIBCXX_INSTALL_LIBRARY OFF CACHE BOOL "") -else() +if(NOT APPLE) set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "") set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "")
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
