This is an archive of the discontinued LLVM Phabricator instance.

Differential D150799

[Fuchsia] Correctly pass lists from STAGE2_ vars
ClosedPublic

Authored by abrachet on May 17 2023, 10:12 AM.

Details

Reviewers
phosek
Commits
rG30c57e275e5a: [Fuchsia] Correctly pass lists from STAGE2_ vars

Diff Detail

Event Timeline

abrachet created this revision.May 17 2023, 10:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2023, 10:12 AM
abrachet requested review of this revision.May 17 2023, 10:12 AM
phosek accepted this revision.May 17 2023, 10:18 AM

LGTM

This revision is now accepted and ready to land.May 17 2023, 10:18 AM
This revision was landed with ongoing or failed builds.May 17 2023, 10:25 AM
Closed by commit rG30c57e275e5a: [Fuchsia] Correctly pass lists from STAGE2_ vars (authored by abrachet). · Explain Why
This revision was automatically updated to reflect the committed changes.
abrachet added a commit: rG30c57e275e5a: [Fuchsia] Correctly pass lists from STAGE2_ vars.
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2023, 10:25 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B232644: Diff 523096.May 17 2023, 6:40 PM

Revision Contents

PathSize
clang/
cmake/
caches/
3 lines

Diff 523101

clang/cmake/caches/Fuchsia.cmake

Show First 20 Lines • Show All 176 Lines • ▼ Show 20 Lines
set(LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "") set(LLVM_ENABLE_PROJECTS ${_FUCHSIA_ENABLE_PROJECTS} CACHE STRING "")
set(CLANG_BOOTSTRAP_TARGETS ${_FUCHSIA_BOOTSTRAP_TARGETS} CACHE STRING "") set(CLANG_BOOTSTRAP_TARGETS ${_FUCHSIA_BOOTSTRAP_TARGETS} CACHE STRING "")
get_cmake_property(variableNames VARIABLES) get_cmake_property(variableNames VARIABLES)
foreach(variableName ${variableNames}) foreach(variableName ${variableNames})
if(variableName MATCHES "^STAGE2_") if(variableName MATCHES "^STAGE2_")
string(REPLACE "STAGE2_" "" new_name ${variableName}) string(REPLACE "STAGE2_" "" new_name ${variableName})
list(APPEND EXTRA_ARGS "-D${new_name}=${${variableName}}") string(REPLACE ";" "|" value "${${variableName}}")
list(APPEND EXTRA_ARGS "-D${new_name}=${value}")
endif() endif()
endforeach() endforeach()
# Setup the bootstrap build. # Setup the bootstrap build.
set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "") set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "")
set(CLANG_BOOTSTRAP_EXTRA_DEPS set(CLANG_BOOTSTRAP_EXTRA_DEPS
builtins builtins
runtimes runtimes
CACHE STRING "") CACHE STRING "")
set(CLANG_BOOTSTRAP_CMAKE_ARGS set(CLANG_BOOTSTRAP_CMAKE_ARGS
${EXTRA_ARGS} ${EXTRA_ARGS}
-C ${CMAKE_CURRENT_LIST_DIR}/Fuchsia-stage2.cmake -C ${CMAKE_CURRENT_LIST_DIR}/Fuchsia-stage2.cmake
CACHE STRING "") CACHE STRING "")