@@ -126,16 +126,6 @@ else()
126
126
set (LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "" )
127
127
set (LIBCXX_HARDENING_MODE "none" CACHE STRING "" )
128
128
set (LIBCXX_USE_COMPILER_RT ON CACHE BOOL "" )
129
- set (COMPILER_RT_BUILD_LIBFUZZER OFF CACHE BOOL "" )
130
- set (COMPILER_RT_BUILD_PROFILE ON CACHE BOOL "" )
131
- set (COMPILER_RT_BUILD_SANITIZERS OFF CACHE BOOL "" )
132
- set (COMPILER_RT_BUILD_XRAY OFF CACHE BOOL "" )
133
- set (COMPILER_RT_USE_BUILTINS_LIBRARY ON CACHE BOOL "" )
134
- set (COMPILER_RT_DEFAULT_TARGET_ONLY ON CACHE BOOL "" )
135
- set (SANITIZER_CXX_ABI "libc++" CACHE STRING "" )
136
- set (SANITIZER_CXX_ABI_INTREE ON CACHE BOOL "" )
137
- set (SANITIZER_TEST_CXX "libc++" CACHE STRING "" )
138
- set (SANITIZER_TEST_CXX_INTREE ON CACHE BOOL "" )
139
129
set (LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "" )
140
130
set (RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "" )
141
131
endif ()
@@ -174,29 +164,34 @@ endif()
174
164
175
165
set (BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "" )
176
166
set (BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "" )
177
- set (BOOTSTRAP_LLVM_BUILD_INSTRUMENTED ON CACHE BOOL "" )
178
167
179
168
set (_FUCHSIA_BOOTSTRAP_TARGETS
180
- generate-profdata
181
- stage2
182
- stage2-toolchain-distribution
183
- stage2-install-toolchain-distribution
184
- stage2-install-toolchain-distribution-stripped
185
- stage2-install-toolchain-distribution-toolchain
186
- stage2-check-all
187
- stage2-check-lld
188
- stage2-check-llvm
189
- stage2-check-clang
190
- stage2-test-suite )
169
+ check-all
170
+ check-clang
171
+ check-lld
172
+ check-llvm
173
+ check-polly
174
+ llvm-config
175
+ clang-test-depends
176
+ lld-test-depends
177
+ llvm-test-depends
178
+ test -suite
179
+ test -depends
180
+ toolchain-distribution
181
+ install -toolchain-distribution
182
+ install -toolchain-distribution-stripped
183
+ install -toolchain-distribution-toolchain
184
+ clang )
191
185
192
186
if (FUCHSIA_ENABLE_LLDB )
193
187
list (APPEND _FUCHSIA_ENABLE_PROJECTS lldb )
194
188
list (APPEND _FUCHSIA_BOOTSTRAP_TARGETS
195
- stage2-check-lldb
196
- stage2-debugger-distribution
197
- stage2-install-debugger-distribution
198
- stage2-install-debugger-distribution-stripped
199
- stage2-install-debugger-distribution-toolchain )
189
+ check-lldb
190
+ lldb-test-depends
191
+ debugger-distribution
192
+ install -debugger-distribution
193
+ install -debugger-distribution-stripped
194
+ install -debugger-distribution-toolchain )
200
195
endif ()
201
196
202
197
set (LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "" )
@@ -205,7 +200,6 @@ set(CLANG_BOOTSTRAP_TARGETS ${_FUCHSIA_BOOTSTRAP_TARGETS} CACHE STRING "")
205
200
get_cmake_property (variableNames VARIABLES )
206
201
foreach (variableName ${variableNames} )
207
202
if (variableName MATCHES "^STAGE2_" )
208
- list (APPEND EXTRA_ARGS "-D${variableName} =${${variableName} }" )
209
203
string (REPLACE "STAGE2_" "" new_name ${variableName} )
210
204
string (REPLACE ";" "|" value "${${variableName} }" )
211
205
list (APPEND EXTRA_ARGS "-D${new_name} =${value} " )
@@ -215,9 +209,6 @@ endforeach()
215
209
# TODO: This is a temporary workaround until we figure out the right solution.
216
210
set (BOOTSTRAP_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "" )
217
211
218
- set (LLVM_BUILTIN_TARGETS "default" CACHE STRING "" )
219
- set (LLVM_RUNTIME_TARGETS "default" CACHE STRING "" )
220
-
221
212
# Setup the bootstrap build.
222
213
set (CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "" )
223
214
set (CLANG_BOOTSTRAP_EXTRA_DEPS
@@ -226,5 +217,5 @@ set(CLANG_BOOTSTRAP_EXTRA_DEPS
226
217
CACHE STRING "" )
227
218
set (CLANG_BOOTSTRAP_CMAKE_ARGS
228
219
${EXTRA_ARGS}
229
- -C ${CMAKE_CURRENT_LIST_DIR} /Fuchsia-stage2-instrumented .cmake
220
+ -C ${CMAKE_CURRENT_LIST_DIR} /Fuchsia-stage2.cmake
230
221
CACHE STRING "" )
0 commit comments