diff options
| author | Daniel Thornburgh <dthorn@google.com> | 2023-03-28 10:26:55 -0700 |
|---|---|---|
| committer | Daniel Thornburgh <dthorn@google.com> | 2023-03-28 10:31:22 -0700 |
| commit | 498e1506981f42c32656150b9d8e0408d91f9f23 (patch) | |
| tree | 0f51e7abe6c62122c9970cfd1f774ec230c43642 /clang/cmake | |
| parent | f9e995b4bdce7e3afbda0997b606fdc80112f803 (diff) | |
| download | llvm-498e1506981f42c32656150b9d8e0408d91f9f23.tar.gz | |
[Fuchsia][CMake] Always use multiple distribution model.
Diffstat (limited to 'clang/cmake')
| -rw-r--r-- | clang/cmake/caches/Fuchsia-stage2.cmake | 15 | ||||
| -rw-r--r-- | clang/cmake/caches/Fuchsia.cmake | 20 |
2 files changed, 6 insertions, 29 deletions
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index b3fa2b941a54..7778a7f84b05 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -1,6 +1,5 @@ # This file sets up a CMakeCache for the second stage of a Fuchsia toolchain build. -option(FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS "Use multiple distributions") option(FUCHSIA_ENABLE_LLDB "Enable LLDB") set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64;RISCV CACHE STRING "") @@ -347,16 +346,9 @@ set(LLVM_Toolchain_DISTRIBUTION_COMPONENTS ${LLVM_TOOLCHAIN_TOOLS} CACHE STRING "") -if(FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS) - set(_FUCHSIA_DISTRIBUTIONS Toolchain) -else() - set(LLVM_DISTRIBUTION_COMPONENTS ${LLVM_Toolchain_DISTRIBUTION_COMPONENTS} CACHE STRING "") -endif() +set(_FUCHSIA_DISTRIBUTIONS Toolchain) if(FUCHSIA_ENABLE_LLDB) - if(NOT FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS) - message(FATAL_ERROR "FUCHSIA_ENABLE_LLDB requires FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS.") - endif() list(APPEND _FUCHSIA_ENABLE_PROJECTS lldb) list(APPEND _FUCHSIA_DISTRIBUTIONS Debugger) set(LLVM_Debugger_DISTRIBUTION_COMPONENTS @@ -367,8 +359,5 @@ if(FUCHSIA_ENABLE_LLDB) CACHE STRING "") endif() -if(FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS) - set(LLVM_DISTRIBUTIONS ${_FUCHSIA_DISTRIBUTIONS} CACHE STRING "") -endif() - +set(LLVM_DISTRIBUTIONS ${_FUCHSIA_DISTRIBUTIONS} CACHE STRING "") set(LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "") diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index 40c2a2af71ed..1032dc82e740 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -1,6 +1,5 @@ # This file sets up a CMakeCache for a Fuchsia toolchain build. -option(FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS "Use multiple distributions") option(FUCHSIA_ENABLE_LLDB "Enable LLDB") set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64;RISCV CACHE STRING "") @@ -36,7 +35,6 @@ set(_FUCHSIA_BOOTSTRAP_PASSTHROUGH CURL_ROOT OpenSSL_ROOT FUCHSIA_ENABLE_LLDB - FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS LLDB_ENABLE_CURSES LLDB_ENABLE_LIBEDIT CMAKE_FIND_PACKAGE_PREFER_CONFIG @@ -160,22 +158,12 @@ set(_FUCHSIA_BOOTSTRAP_TARGETS llvm-test-depends test-suite test-depends + toolchain-distribution + install-toolchain-distribution + install-toolchain-distribution-stripped + install-toolchain-distribution-toolchain clang) -if(FUCHSIA_USE_MULTIPLE_DISTRIBUTIONS) - list(APPEND _FUCHSIA_BOOTSTRAP_TARGETS - toolchain-distribution - install-toolchain-distribution - install-toolchain-distribution-stripped - install-toolchain-distribution-toolchain) -else() - list(APPEND _FUCHSIA_BOOTSTRAP_TARGETS - distribution - install-distribution - install-distribution-stripped - install-distribution-toolchain) -endif() - if(FUCHSIA_ENABLE_LLDB) list(APPEND _FUCHSIA_ENABLE_PROJECTS lldb) list(APPEND _FUCHSIA_BOOTSTRAP_TARGETS |