From 1a3a4deb31d4891f91e9af60b41d12775c665540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 31 Dec 2024 17:51:30 +0100 Subject: [PATCH] WIP --- src/bootstrap/src/core/build_steps/gcc.rs | 16 ++++++++-------- .../host-x86_64/dist-x86_64-linux/Dockerfile | 3 --- src/ci/github-actions/jobs.yml | 1 + 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/gcc.rs b/src/bootstrap/src/core/build_steps/gcc.rs index d07b7d2566789..9de5fdc5d959f 100644 --- a/src/bootstrap/src/core/build_steps/gcc.rs +++ b/src/bootstrap/src/core/build_steps/gcc.rs @@ -117,14 +117,14 @@ impl Step for Gcc { // Download dependencies into the build directory, to avoid modifying the source directory // The configure script should automatically find them in the build directory - // command(root.join("contrib/download_prerequisites")) - // The script sadly tries to write symlinks to the source directory, even if we - // actually download the dependencies elsewhere. - // .allow_failure() - // .current_dir(&root) - // .arg("--directory") - // .arg(&deps_dir) - // .run(builder); + command(root.join("contrib/download_prerequisites")) + // The script sadly tries to write symlinks to the source directory, even if we + // actually download the dependencies elsewhere. + // .allow_failure() + .current_dir(&root) + // .arg("--directory") + // .arg(&deps_dir) + .run(builder); let mut configure_cmd = command(root.join("configure")); configure_cmd 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 93f426ba56857..a42f693c69612 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 @@ -35,9 +35,6 @@ RUN yum upgrade -y && \ unzip \ wget \ xz \ - gmp-devel \ - mpfr-devel \ - mpc-devel \ zlib-devel.i686 \ zlib-devel.x86_64 \ && yum clean all diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 876a779359215..2ded8b334b6a1 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -113,6 +113,7 @@ try: - image: dist-x86_64-linux env: CODEGEN_BACKENDS: llvm,cranelift + READ_ONLY_SRC: "0" <<: *job-linux-16c # Main CI jobs that have to be green to merge a commit into master