Skip to content

Commit 60c30f5

Browse files
ci: Consolidate $IS_NOT_LATEST_LLVM into $EXTERNAL_LLVM
We want to only demand that we check for all components we expect if we actually built the components we expect, which means we built the LLVM. Otherwise, it isn't worth checking.
1 parent ce092d4 commit 60c30f5

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ RUN sh /scripts/sccache.sh
4545
ENV NO_DOWNLOAD_CI_LLVM 1
4646
ENV EXTERNAL_LLVM 1
4747

48-
# This is not the latest LLVM version, so some components required by tests may
49-
# be missing.
50-
ENV IS_NOT_LATEST_LLVM 1
51-
5248
# Using llvm-link-shared due to libffi issues -- see #34486
5349
ENV RUST_CONFIGURE_ARGS \
5450
--build=x86_64-unknown-linux-gnu \

src/ci/run.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --dist-compression-formats=xz"
8989
# (to avoid spending a lot of time cloning llvm)
9090
if [ "$EXTERNAL_LLVM" = "" ]; then
9191
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins"
92+
# Likewise, only demand we test all LLVM components if we know we built LLVM with them
93+
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
9294
elif [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
9395
echo "error: dist builds should always use optimized compiler-rt!" >&2
9496
exit 1
@@ -169,12 +171,6 @@ else
169171
fi
170172
fi
171173

172-
# Unless we're using an older version of LLVM, check that all LLVM components
173-
# used by tests are available.
174-
if [ "$IS_NOT_LATEST_LLVM" = "" ]; then
175-
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
176-
fi
177-
178174
if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then
179175
# If `ENABLE_GCC_CODEGEN` is set and not empty, we add the `--enable-new-symbol-mangling`
180176
# argument to `RUST_CONFIGURE_ARGS` and set the `GCC_EXEC_PREFIX` environment variable.

0 commit comments

Comments
 (0)