Skip to content

Commit 65ac8ac

Browse files
committed
fix fs bug on CI and update ming-check-1 Dockerfile
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 8424997 commit 65ac8ac

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,14 @@ impl Step for StdLink {
788788
}
789789
} else if compiler.stage == 0 {
790790
let sysroot = builder.out.join(compiler.host.triple).join("stage0-sysroot");
791+
792+
if builder.local_rebuild {
793+
// On local rebuilds this path might be a symlink to the project root,
794+
// which can be read-only (e.g., on CI). So remove it before copying
795+
// the stage0 lib.
796+
let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
797+
}
798+
791799
builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
792800
} else {
793801
if builder.download_rustc() {

src/ci/docker/host-x86_64/mingw-check-1/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ COPY host-x86_64/mingw-check-1/validate-error-codes.sh /scripts/
4747
ENV SCRIPT \
4848
/scripts/check-default-config-profiles.sh && \
4949
python3 ../x.py build --stage 0 src/tools/build-manifest && \
50+
python3 ../x.py test --stage 0 src/tools/compiletest && \
5051
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
5152
python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
5253
python3 ../x.py check --stage 1 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \

0 commit comments

Comments
 (0)