diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-02-09 12:38:16 +0100 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-02-09 12:38:16 +0100 |
| commit | e25566e20b079b7eae57518768dee44fb53c8cbb (patch) | |
| tree | a686ce563f3fd3c1798e637246957090540cbe8a /compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs | |
| parent | c40919b7a75f93ed7ef040361e82c656d246d41e (diff) | |
| parent | 7d53619064ab7045c383644cb445052d2a3d46db (diff) | |
| download | rust-e25566e20b079b7eae57518768dee44fb53c8cbb.tar.gz rust-e25566e20b079b7eae57518768dee44fb53c8cbb.zip | |
Merge commit '7d53619064ab7045c383644cb445052d2a3d46db' into sync_cg_clif-2023-02-09
Diffstat (limited to 'compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs b/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs index dbee9be04ee..0da27f529b3 100644 --- a/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs +++ b/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs @@ -6,11 +6,10 @@ use super::prepare::GitRepo; use super::utils::{spawn_and_wait, CargoProject, Compiler}; use super::SysrootKind; -pub(crate) static ABI_CAFE_REPO: GitRepo = +static ABI_CAFE_REPO: GitRepo = GitRepo::github("Gankra", "abi-cafe", "4c6dc8c9c687e2b3a760ff2176ce236872b37212", "abi-cafe"); -pub(crate) static ABI_CAFE: CargoProject = - CargoProject::new(&ABI_CAFE_REPO.source_dir(), "abi_cafe"); +static ABI_CAFE: CargoProject = CargoProject::new(&ABI_CAFE_REPO.source_dir(), "abi_cafe"); pub(crate) fn run( channel: &str, @@ -19,6 +18,9 @@ pub(crate) fn run( cg_clif_dylib: &Path, bootstrap_host_compiler: &Compiler, ) { + ABI_CAFE_REPO.fetch(dirs); + spawn_and_wait(ABI_CAFE.fetch("cargo", &bootstrap_host_compiler.rustc, dirs)); + eprintln!("Building sysroot for abi-cafe"); build_sysroot::build_sysroot( dirs, |