Author: Petr Hosek Date: 2019-10-24T16:35:29-07:00 New Revision: 7fff716ec4741f84358a977ddf0cd5ccf448d5c5
URL: https://github.com/llvm/llvm-project/commit/7fff716ec4741f84358a977ddf0cd5ccf448d5c5 DIFF: https://github.com/llvm/llvm-project/commit/7fff716ec4741f84358a977ddf0cd5ccf448d5c5.diff LOG: [CMake] Update Fuchsia build configuration This includes several changes to our toolchain build: - Switch from RelWithDebInfo to Release as we don't currently use the debug info and therefore don't need to produce it. - Disable unwind tables since we don't need them. - Disable Clang static analyzer and ARCMT since we don't use it. - Disable Go tests since we don't distribute Go bindings. - Set the deployment target for macOS to 10.7 to make the toolchain usable on older systems. - Restrict the targets we build runtimes for on Darwin only the ones we actually need. - Drop llc and opt from the distribution since we don't need them. Differential Revision: https://reviews.llvm.org/D69415 Added: Modified: clang/cmake/caches/Fuchsia-stage2.cmake clang/cmake/caches/Fuchsia.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index b7833c8ac036..9fdf147fd395 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -11,10 +11,11 @@ endif() set(LLVM_ENABLE_LTO ON CACHE BOOL "") set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "") set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "") +set(LLVM_ENABLE_UNWIND_TABLES OFF CACHE BOOL "") set(LLVM_ENABLE_ZLIB ON CACHE BOOL "") -set(LLVM_EXTERNALIZE_DEBUGINFO ON CACHE BOOL "") -set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") +set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") +set(LLVM_INCLUDE_GO_TESTS OFF CACHE BOOL "") set(LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO ON CACHE BOOL "") set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") @@ -23,15 +24,18 @@ if(NOT APPLE) set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") endif() set(CLANG_DEFAULT_RTLIB compiler-rt CACHE STRING "") +set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "") +set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "") set(CLANG_PLUGIN_SUPPORT OFF CACHE BOOL "") set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER ON CACHE BOOL "") set(ENABLE_LINKER_BUILD_ID ON CACHE BOOL "") set(ENABLE_X86_RELAX_RELOCATIONS ON CACHE BOOL "") -set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") -set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only" CACHE STRING "") -set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only" CACHE STRING "") +set(CMAKE_BUILD_TYPE Release CACHE STRING "") +if (APPLE) + set(MACOSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "") +endif() if(APPLE) list(APPEND BUILTIN_TARGETS "default") @@ -52,6 +56,10 @@ if(APPLE) set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "") set(LIBCXX_ABI_VERSION 2 CACHE STRING "") + set(DARWIN_ios_ARCHS armv7;armv7s;arm64 CACHE STRING "") + 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 "") endif() foreach(target aarch64-unknown-linux-gnu;armv7-unknown-linux-gnueabihf;i386-unknown-linux-gnu;x86_64-unknown-linux-gnu) @@ -179,7 +187,6 @@ set(LLVM_RUNTIME_BUILD_ID_LINK_TARGETS "${RUNTIME_BUILD_ID_LINK}" CACHE STRING " set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS dsymutil - llc llvm-ar llvm-cov llvm-cxxfilt @@ -197,7 +204,6 @@ set(LLVM_TOOLCHAIN_TOOLS llvm-strip llvm-symbolizer llvm-xray - opt sancov CACHE STRING "") diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index 486d53b75f8e..607bf0b0776d 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -7,9 +7,11 @@ set(PACKAGE_VENDOR Fuchsia CACHE STRING "") set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "") set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "") set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "") +set(LLVM_ENABLE_UNWIND_TABLES OFF CACHE BOOL "") set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "") -set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") +set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") +set(LLVM_INCLUDE_GO_TESTS OFF CACHE BOOL "") set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") if(NOT APPLE) @@ -17,6 +19,8 @@ if(NOT APPLE) set(CLANG_DEFAULT_OBJCOPY llvm-objcopy CACHE STRING "") endif() set(CLANG_DEFAULT_RTLIB compiler-rt CACHE STRING "") +set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "") +set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "") set(CLANG_PLUGIN_SUPPORT OFF CACHE BOOL "") set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER ON CACHE BOOL "") @@ -25,6 +29,9 @@ set(ENABLE_X86_RELAX_RELOCATIONS ON CACHE BOOL "") set(LLVM_ENABLE_ASSERTIONS ON CACHE BOOL "") set(CMAKE_BUILD_TYPE Release CACHE STRING "") +if (APPLE) + set(MACOSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "") +endif() if(APPLE) set(COMPILER_RT_ENABLE_IOS OFF CACHE BOOL "") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
