Skip to content

Commit be7ebdd

Browse files
committedJun 20, 2017
Bump version and stage0 compiler
1 parent 0414594 commit be7ebdd

File tree

47 files changed

+24
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+24
-283
lines changed
 

‎src/Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/bin/rustc.rs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,6 @@ fn main() {
118118
cmd.arg("-Cprefer-dynamic");
119119
}
120120

121-
// Pass the `rustbuild` feature flag to crates which rustbuild is
122-
// building. See the comment in bootstrap/lib.rs where this env var is
123-
// set for more details.
124-
if env::var_os("RUSTBUILD_UNSTABLE").is_some() {
125-
cmd.arg("--cfg").arg("rustbuild");
126-
}
127-
128121
// Help the libc crate compile by assisting it in finding the MUSL
129122
// native libraries.
130123
if let Some(s) = env::var_os("MUSL_ROOT") {
@@ -218,11 +211,7 @@ fn main() {
218211
// do that we pass a weird flag to the compiler to get it to do
219212
// so. Note that this is definitely a hack, and we should likely
220213
// flesh out rpath support more fully in the future.
221-
//
222-
// FIXME: remove condition after next stage0
223-
if stage != "0" {
224-
cmd.arg("-Z").arg("osx-rpath-install-name");
225-
}
214+
cmd.arg("-Z").arg("osx-rpath-install-name");
226215
Some("-Wl,-rpath,@loader_path/../lib")
227216
} else if !target.contains("windows") {
228217
Some("-Wl,-rpath,$ORIGIN/../lib")
@@ -242,12 +231,8 @@ fn main() {
242231
// Force all crates compiled by this compiler to (a) be unstable and (b)
243232
// allow the `rustc_private` feature to link to other unstable crates
244233
// also in the sysroot.
245-
//
246-
// FIXME: remove condition after next stage0
247234
if env::var_os("RUSTC_FORCE_UNSTABLE").is_some() {
248-
if stage != "0" {
249-
cmd.arg("-Z").arg("force-unstable-if-unmarked");
250-
}
235+
cmd.arg("-Z").arg("force-unstable-if-unmarked");
251236
}
252237
}
253238

0 commit comments

Comments
 (0)
Please sign in to comment.