@@ -126,6 +126,16 @@ 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 "" )
129
139
set (LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "" )
130
140
set (RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "" )
131
141
endif ()
@@ -164,34 +174,29 @@ endif()
164
174
165
175
set (BOOTSTRAP_LLVM_ENABLE_LLD ON CACHE BOOL "" )
166
176
set (BOOTSTRAP_LLVM_ENABLE_LTO ON CACHE BOOL "" )
177
+ set (BOOTSTRAP_LLVM_BUILD_INSTRUMENTED ON CACHE BOOL "" )
167
178
168
179
set (_FUCHSIA_BOOTSTRAP_TARGETS
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)
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)
185
191
186
192
if (FUCHSIA_ENABLE_LLDB)
187
193
list (APPEND _FUCHSIA_ENABLE_PROJECTS lldb)
188
194
list (APPEND _FUCHSIA_BOOTSTRAP_TARGETS
189
- check-lldb
190
- lldb-test -depends
191
- debugger-distribution
192
- install -debugger-distribution
193
- install -debugger-distribution-stripped
194
- install -debugger-distribution-toolchain)
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)
195
200
endif ()
196
201
197
202
set (LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "" )
@@ -200,6 +205,7 @@ set(CLANG_BOOTSTRAP_TARGETS ${_FUCHSIA_BOOTSTRAP_TARGETS} CACHE STRING "")
200
205
get_cmake_property (variableNames VARIABLES )
201
206
foreach (variableName ${variableNames} )
202
207
if (variableName MATCHES "^STAGE2_" )
208
+ list (APPEND EXTRA_ARGS "-D${variableName} =${${variableName} }" )
203
209
string (REPLACE "STAGE2_" "" new_name ${variableName} )
204
210
string (REPLACE ";" "|" value "${${variableName} }" )
205
211
list (APPEND EXTRA_ARGS "-D${new_name} =${value} " )
@@ -209,6 +215,9 @@ endforeach()
209
215
# TODO: This is a temporary workaround until we figure out the right solution.
210
216
set (BOOTSTRAP_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "" )
211
217
218
+ set (LLVM_BUILTIN_TARGETS "default" CACHE STRING "" )
219
+ set (LLVM_RUNTIME_TARGETS "default" CACHE STRING "" )
220
+
212
221
# Setup the bootstrap build.
213
222
set (CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "" )
214
223
set (CLANG_BOOTSTRAP_EXTRA_DEPS
@@ -217,5 +226,5 @@ set(CLANG_BOOTSTRAP_EXTRA_DEPS
217
226
CACHE STRING "" )
218
227
set (CLANG_BOOTSTRAP_CMAKE_ARGS
219
228
${EXTRA_ARGS}
220
- -C ${CMAKE_CURRENT_LIST_DIR} /Fuchsia-stage2.cmake
229
+ -C ${CMAKE_CURRENT_LIST_DIR} /Fuchsia-stage2-instrumented .cmake
221
230
CACHE STRING "" )
0 commit comments