From 1b39b43479f0a2e27594f8a5c1720411b74d7f79 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 14 Aug 2024 15:32:25 +0200 Subject: [PATCH] Make gcc `root` absolute --- src/bootstrap/src/core/build_steps/gcc.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/gcc.rs b/src/bootstrap/src/core/build_steps/gcc.rs index 1ddf2e64223..e1a9096447a 100644 --- a/src/bootstrap/src/core/build_steps/gcc.rs +++ b/src/bootstrap/src/core/build_steps/gcc.rs @@ -41,7 +41,7 @@ pub fn prebuilt_gcc_config(builder: &Builder<'_>, target: TargetSelection) -> Gc // FIXME (GuillaumeGomez): To be done once gccjit has been built in the CI. // builder.config.maybe_download_ci_gcc(); - let root = "src/gcc"; + let root = builder.src.join("src/gcc"); let out_dir = builder.gcc_out(target).join("build"); let install_dir = builder.gcc_out(target).join("install"); @@ -71,7 +71,7 @@ pub fn prebuilt_gcc_config(builder: &Builder<'_>, target: TargetSelection) -> Gc return GccBuildStatus::AlreadyBuilt; } - GccBuildStatus::ShouldBuild(Meta { stamp, out_dir, install_dir, root: root.into() }) + GccBuildStatus::ShouldBuild(Meta { stamp, out_dir, install_dir, root }) } #[derive(Debug, Clone, Hash, PartialEq, Eq)]