Skip to content

Commit

Permalink
Auto merge of #38076 - alexcrichton:another-rustbuild-bug, r=japaric
Browse files Browse the repository at this point in the history
rustbuild: Use src/rustc for assembled compilers

The `src/rustc` path is intended for assembling a compiler (e.g. the bare bones)
not actually compiling the whole compiler itself. This path was accidentally
getting hijacked to represent the whole compiler being compiled, so let's
redirect that elsewhere for that particular cargo project.

Closes #38039
  • Loading branch information
bors committed Dec 8, 2016
2 parents 7b06438 + 8e9f7f5 commit d9aae63
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/bootstrap/step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,14 @@ pub fn build_rules(build: &Build) -> Rules {
});
}
for (krate, path, default) in krates("rustc-main") {
// We hijacked the `src/rustc` path above for "build just the compiler"
// so let's not reinterpret it here as everything and redirect the
// `src/rustc` path to a nonexistent path.
let path = if path == "src/rustc" {
"path/to/nowhere"
} else {
path
};
rules.build(&krate.build_step, path)
.dep(|s| s.name("libtest"))
.dep(move |s| s.name("llvm").host(&build.config.build).stage(0))
Expand Down

0 comments on commit d9aae63

Please sign in to comment.