diff options
| author | Wang Xuerui <git@xen0n.name> | 2016-12-19 16:39:19 +0800 |
|---|---|---|
| committer | Wang Xuerui <git@xen0n.name> | 2016-12-20 21:43:59 +0800 |
| commit | 8e38b2de42dda1752400524b69f76051586d469b (patch) | |
| tree | 5d8ce3f64e64a6a64e87bb3a75b50cdeee19416c | |
| parent | 46d74eac236c7b58c848a471d81f9d5c59362513 (diff) | |
| download | rust-8e38b2de42dda1752400524b69f76051586d469b.tar.gz rust-8e38b2de42dda1752400524b69f76051586d469b.zip | |
rustbuild: package src only once for build triple
| -rw-r--r-- | src/bootstrap/dist.rs | 8 | ||||
| -rw-r--r-- | src/bootstrap/step.rs | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index be51a6753fb..6e3174ed2f6 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -346,8 +346,14 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) { } /// Creates the `rust-src` installer component and the plain source tarball -pub fn rust_src(build: &Build) { +pub fn rust_src(build: &Build, host: &str) { println!("Dist src"); + + if host != build.config.build { + println!("\tskipping, not a build host"); + return + } + let plain_name = format!("rustc-{}-src", package_vers(build)); let name = format!("rust-src-{}", package_vers(build)); let image = tmpdir(build).join(format!("{}-image", name)); diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index def06ee6983..719fb82a56d 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -499,7 +499,7 @@ pub fn build_rules(build: &Build) -> Rules { rules.dist("dist-src", "src") .default(true) .host(true) - .run(move |_| dist::rust_src(build)); + .run(move |s| dist::rust_src(build, s.target)); rules.dist("dist-docs", "src/doc") .default(true) .dep(|s| s.name("default:doc")) |