about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2025-03-13 11:31:08 +0100
committerJakub Beránek <berykubik@gmail.com>2025-03-13 21:29:46 +0100
commit3fc7ca0fee9806983423dcd4aab06e42c856cd78 (patch)
treec1dba204c04c79e3e224bfb01616db56a6c591ec /src/ci
parent955aef5a4edd849ce2bd3f9303cb650f5bc6b08f (diff)
downloadrust-3fc7ca0fee9806983423dcd4aab06e42c856cd78.tar.gz
rust-3fc7ca0fee9806983423dcd4aab06e42c856cd78.zip
Use GCC for building GCC
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
index f54ecef1e30..ae5bf8946dd 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@@ -101,7 +101,9 @@ ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
     ./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
     --host $HOSTS --target $HOSTS \
     --include-default-paths \
-    build-manifest bootstrap gcc
+    build-manifest bootstrap && \
+    # Use GCC for building GCC, as it seems to behave badly when built with Clang
+    CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=clang
 
 # This is the only builder which will create source tarballs