This is an archive of the discontinued LLVM Phabricator instance.

Differential D148830

[libc++] Use $CXX instead of 'c++' in run-buildbot
ClosedPublic

Authored by ldionne on Apr 20 2023, 12:07 PM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rG692dd56e4b3d: [libc++] Use $CXX instead of 'c++' in run-buildbot
Summary

We don't have c++ anymore in the Docker image, but the script does
require $CXX to be in the environment so that should always work.

Diff Detail

Event Timeline

ldionne created this revision.Apr 20 2023, 12:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 20 2023, 12:07 PM
Herald added a subscriber: arichardson. · View Herald Transcript
ldionne requested review of this revision.Apr 20 2023, 12:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 20 2023, 12:07 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B226940: Diff 515423.Apr 20 2023, 2:34 PM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 21 2023, 4:15 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG692dd56e4b3d: [libc++] Use $CXX instead of 'c++' in run-buildbot (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG692dd56e4b3d: [libc++] Use $CXX instead of 'c++' in run-buildbot.

Revision Contents

PathSize
libcxx/
utils/
ci/
2 lines

Diff 515676

libcxx/utils/ci/run-buildbot

Show First 20 Lines • Show All 331 Lines • ▼ Show 20 Linesbootstrapping-build)
${CMAKE} \ ${CMAKE} \
-S "${MONOREPO_ROOT}/llvm" \ -S "${MONOREPO_ROOT}/llvm" \
-B "${BUILD_DIR}" \ -B "${BUILD_DIR}" \
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \ -GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-DLLVM_ENABLE_PROJECTS="clang" \ -DLLVM_ENABLE_PROJECTS="clang" \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
-DLLVM_RUNTIME_TARGETS="$(c++ --print-target-triple)" \ -DLLVM_RUNTIME_TARGETS="$(${CXX} --print-target-triple)" \
-DLLVM_TARGETS_TO_BUILD="host" \ -DLLVM_TARGETS_TO_BUILD="host" \
-DRUNTIMES_BUILD_ALLOW_DARWIN=ON \ -DRUNTIMES_BUILD_ALLOW_DARWIN=ON \
-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_ASSERTIONS=ON
echo "+++ Running the libc++ and libc++abi tests" echo "+++ Running the libc++ and libc++abi tests"
${NINJA} -C "${BUILD_DIR}" check-runtimes ${NINJA} -C "${BUILD_DIR}" check-runtimes
echo "--- Installing libc++ and libc++abi to a fake location" echo "--- Installing libc++ and libc++abi to a fake location"
▲ Show 20 Lines • Show All 321 Lines • Show Last 20 Lines