Skip to content

Commit f315c68

Browse files
Auto merge of #147582 - Zalathar:env-mkdir-p, r=<try>
(DO NOT MERGE) ci: Set `MKDIR_P` to work around a libffi-sys build failure try-job: aarch64-gnu try-job: aarch64-gnu-debug try-job: aarch64-gnu-llvm-20-1 try-job: aarch64-gnu-llvm-20-2
2 parents 9725c4b + 5b4e514 commit f315c68

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS 1
3434
# llvm.use-linker conflicts with downloading CI LLVM
3535
ENV NO_DOWNLOAD_CI_LLVM 1
3636

37+
# FIXME(#147556): Work around a libffi-sys build failure by telling `configure`
38+
# that it can use `mkdir -p`.
39+
ENV MKDIR_P mkdir -p
40+
3741
ENV RUST_CONFIGURE_ARGS \
3842
--build=aarch64-unknown-linux-gnu \
3943
--enable-debug \

src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ RUN sh /scripts/sccache.sh
4040
ENV NO_DOWNLOAD_CI_LLVM 1
4141
ENV EXTERNAL_LLVM 1
4242

43+
# FIXME(#147556): Work around a libffi-sys build failure by telling `configure`
44+
# that it can use `mkdir -p`.
45+
ENV MKDIR_P mkdir -p
46+
4347
# Using llvm-link-shared due to libffi issues -- see #34486
4448
ENV RUST_CONFIGURE_ARGS \
4549
--build=aarch64-unknown-linux-gnu \

src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
COPY scripts/sccache.sh /scripts/
2222
RUN sh /scripts/sccache.sh
2323

24+
# FIXME(#147556): Work around a libffi-sys build failure by telling `configure`
25+
# that it can use `mkdir -p`.
26+
ENV MKDIR_P mkdir -p
27+
2428
ENV RUST_CONFIGURE_ARGS \
2529
--build=aarch64-unknown-linux-gnu \
2630
--enable-sanitizers \

0 commit comments

Comments
 (0)