Skip to content

Commit 957d78c

Browse files
committed
Fetch all cargo dependencies in ./y.rs prepare
1 parent 1a89507 commit 957d78c

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

build_system/abi_cafe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::SysrootKind;
1010
pub(crate) static ABI_CAFE_REPO: GitRepo =
1111
GitRepo::github("Gankra", "abi-cafe", "4c6dc8c9c687e2b3a760ff2176ce236872b37212", "abi-cafe");
1212

13-
static ABI_CAFE: CargoProject = CargoProject::new(&ABI_CAFE_REPO.source_dir(), "abi_cafe");
13+
pub(crate) static ABI_CAFE: CargoProject = CargoProject::new(&ABI_CAFE_REPO.source_dir(), "abi_cafe");
1414

1515
pub(crate) fn run(
1616
channel: &str,

build_system/build_backend.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::path::{Dirs, RelPath};
55
use super::rustc_info::get_file_name;
66
use super::utils::{is_ci, CargoProject, Compiler};
77

8-
static CG_CLIF: CargoProject = CargoProject::new(&RelPath::SOURCE, "cg_clif");
8+
pub(crate) static CG_CLIF: CargoProject = CargoProject::new(&RelPath::SOURCE, "cg_clif");
99

1010
pub(crate) fn build_backend(
1111
dirs: &Dirs,

build_system/build_sysroot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub(crate) static ORIG_BUILD_SYSROOT: RelPath = RelPath::SOURCE.join("build_sysr
153153
pub(crate) static BUILD_SYSROOT: RelPath = RelPath::DOWNLOAD.join("sysroot");
154154
pub(crate) static SYSROOT_RUSTC_VERSION: RelPath = BUILD_SYSROOT.join("rustc_version");
155155
pub(crate) static SYSROOT_SRC: RelPath = BUILD_SYSROOT.join("sysroot_src");
156-
static STANDARD_LIBRARY: CargoProject = CargoProject::new(&BUILD_SYSROOT, "build_sysroot");
156+
pub(crate) static STANDARD_LIBRARY: CargoProject = CargoProject::new(&BUILD_SYSROOT, "build_sysroot");
157157

158158
fn build_clif_sysroot_for_triple(
159159
dirs: &Dirs,

build_system/prepare.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@ pub(crate) fn prepare(dirs: &Dirs) {
1616
}
1717
std::fs::create_dir_all(RelPath::DOWNLOAD.to_path(dirs)).unwrap();
1818

19+
spawn_and_wait(super::build_backend::CG_CLIF.fetch("cargo", dirs));
20+
1921
prepare_sysroot(dirs);
22+
spawn_and_wait(super::build_sysroot::STANDARD_LIBRARY.fetch("cargo", dirs));
23+
spawn_and_wait(super::tests::LIBCORE_TESTS.fetch("cargo", dirs));
2024

2125
super::abi_cafe::ABI_CAFE_REPO.fetch(dirs);
26+
spawn_and_wait(super::abi_cafe::ABI_CAFE.fetch("cargo", dirs));
2227
super::tests::RAND_REPO.fetch(dirs);
28+
spawn_and_wait(super::tests::RAND.fetch("cargo", dirs));
2329
super::tests::REGEX_REPO.fetch(dirs);
30+
spawn_and_wait(super::tests::REGEX.fetch("cargo", dirs));
2431
super::tests::PORTABLE_SIMD_REPO.fetch(dirs);
32+
spawn_and_wait(super::tests::PORTABLE_SIMD.fetch("cargo", dirs));
2533
super::bench::SIMPLE_RAYTRACER_REPO.fetch(dirs);
34+
spawn_and_wait(super::bench::SIMPLE_RAYTRACER.fetch("cargo", dirs));
2635
}
2736

2837
fn prepare_sysroot(dirs: &Dirs) {

build_system/tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
9797
pub(crate) static RAND_REPO: GitRepo =
9898
GitRepo::github("rust-random", "rand", "0f933f9c7176e53b2a3c7952ded484e1783f0bf1", "rand");
9999

100-
static RAND: CargoProject = CargoProject::new(&RAND_REPO.source_dir(), "rand");
100+
pub(crate) static RAND: CargoProject = CargoProject::new(&RAND_REPO.source_dir(), "rand");
101101

102102
pub(crate) static REGEX_REPO: GitRepo =
103103
GitRepo::github("rust-lang", "regex", "341f207c1071f7290e3f228c710817c280c8dca1", "regex");
104104

105-
static REGEX: CargoProject = CargoProject::new(&REGEX_REPO.source_dir(), "regex");
105+
pub(crate) static REGEX: CargoProject = CargoProject::new(&REGEX_REPO.source_dir(), "regex");
106106

107107
pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github(
108108
"rust-lang",
@@ -111,10 +111,10 @@ pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github(
111111
"portable-simd",
112112
);
113113

114-
static PORTABLE_SIMD: CargoProject =
114+
pub(crate) static PORTABLE_SIMD: CargoProject =
115115
CargoProject::new(&PORTABLE_SIMD_REPO.source_dir(), "portable_simd");
116116

117-
static LIBCORE_TESTS: CargoProject =
117+
pub(crate) static LIBCORE_TESTS: CargoProject =
118118
CargoProject::new(&SYSROOT_SRC.join("library/core/tests"), "core_tests");
119119

120120
const EXTENDED_SYSROOT_SUITE: &[TestCase] = &[

0 commit comments

Comments
 (0)