Author: Daniel Thornburgh Date: 2023-03-07T15:04:31-08:00 New Revision: c0e9c55db3b6a2a1287ba96ef3d378b97b72714a
URL: https://github.com/llvm/llvm-project/commit/c0e9c55db3b6a2a1287ba96ef3d378b97b72714a DIFF: https://github.com/llvm/llvm-project/commit/c0e9c55db3b6a2a1287ba96ef3d378b97b72714a.diff LOG: [Fuchsia] Add LLDB options to stage 1 cmake. LLVM_ENABLE_PROJECTS is automatically forwarded from stage 1 builds to stage 2 builds, so setting FUCHSIA_ENABLE_LLDB has no effect on two-stage builds. Instead, add FUCHSIA_ENABLE_LLDB to the stage one build as well. This also disables curses and libedit by default for now in both stage1 and stage 2 builds; these should be opt-in. Reviewed By: haowei Differential Revision: https://reviews.llvm.org/D145449 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 016fa9eb5f9d2..c874d8cacd197 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -23,6 +23,8 @@ set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") set(LLVM_STATIC_LINK_CXX_STDLIB ON CACHE BOOL "") set(LLVM_USE_RELATIVE_PATHS_IN_FILES ON CACHE BOOL "") +set(LLDB_ENABLE_CURSES OFF CACHE BOOL "") +set(LLDB_ENABLE_LIBEDIT OFF CACHE BOOL "") if(WIN32) set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "") diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index d9b34dd757e9a..cf63153da89c0 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -4,7 +4,7 @@ set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64;RISCV CACHE STRING "") set(PACKAGE_VENDOR Fuchsia CACHE STRING "") -set(LLVM_ENABLE_PROJECTS "bolt;clang;clang-tools-extra;lld;llvm;polly" CACHE STRING "") +set(_FUCHSIA_ENABLE_PROJECTS "bolt;clang;clang-tools-extra;lld;llvm;polly") set(LLVM_ENABLE_DIA_SDK OFF CACHE BOOL "") set(LLVM_ENABLE_LIBEDIT OFF CACHE BOOL "") @@ -17,6 +17,8 @@ set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "") set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") set(LLVM_USE_RELATIVE_PATHS_IN_FILES ON CACHE BOOL "") +set(LLDB_ENABLE_CURSES OFF CACHE BOOL "") +set(LLDB_ENABLE_LIBEDIT OFF CACHE BOOL "") # Passthrough stage1 flags to stage1. set(_FUCHSIA_BOOTSTRAP_PASSTHROUGH @@ -30,6 +32,9 @@ set(_FUCHSIA_BOOTSTRAP_PASSTHROUGH LLVM_ENABLE_CURL CURL_ROOT OpenSSL_ROOT + FUCHSIA_ENABLE_LLDB + LLDB_ENABLE_CURSES + LLDB_ENABLE_LIBEDIT CMAKE_FIND_PACKAGE_PREFER_CONFIG CMAKE_SYSROOT CMAKE_MODULE_LINKER_FLAGS @@ -157,6 +162,12 @@ set(CLANG_BOOTSTRAP_TARGETS install-distribution-toolchain clang CACHE STRING "") +set(FUCHSIA_ENABLE_LLDB OFF CACHE BOOL "Enable LLDB") +if(FUCHSIA_ENABLE_LLDB) + list(APPEND _FUCHSIA_ENABLE_PROJECTS lldb) +endif() +set(LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "") + get_cmake_property(variableNames VARIABLES) foreach(variableName ${variableNames}) if(variableName MATCHES "^STAGE2_") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
