Skip to content

Commit 8d22af8

Browse files
committed
Auto merge of #43059 - Mark-Simulacrum:rustbuild-2.0, r=alexcrichton
Rework Rustbuild to an eagerly compiling approach This introduces a new dependency on `serde`; I don't believe that's a problem since bootstrap is compiled with nightly/beta always so proc macros are available. Compile times are slightly longer -- about 2-3x (30 seconds vs. 10 seconds). I don't think this is too big a problem, especially since recompiling bootstrap is somewhat rare. I think we can remove the dependency on Serde if necessary, though, so let me know. r? @alexcrichton
2 parents f8d485f + 1c11823 commit 8d22af8

20 files changed

+5460
-4677
lines changed

src/Cargo.lock

+8-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/Cargo.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ build_helper = { path = "../build_helper" }
3333
cmake = "0.1.23"
3434
filetime = "0.1"
3535
num_cpus = "1.0"
36-
toml = "0.1"
3736
getopts = "0.2"
38-
rustc-serialize = "0.3"
3937
gcc = "0.3.50"
4038
libc = "0.2"
39+
serde = "1.0.8"
40+
serde_derive = "1.0.8"
41+
serde_json = "1.0.2"
42+
toml = "0.4"
43+
lazy_static = "0.2"

0 commit comments

Comments
 (0)