diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-11-04 16:49:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-11-05 10:50:24 -0700 |
| commit | 9f882b997eaff8def0b31db22fe250776d38af60 (patch) | |
| tree | 033f3a026145c13e6475b420c1b30474f9dcccff | |
| parent | b9f18bf79bf8d0fd3ad1f51c9213e7522060160a (diff) | |
| parent | 6a34feb034407cfcc82ccd951c13fb654689f130 (diff) | |
| download | rust-9f882b997eaff8def0b31db22fe250776d38af60.tar.gz rust-9f882b997eaff8def0b31db22fe250776d38af60.zip | |
Rollup merge of #37566 - brson:env, r=alexcrichton
Set RUSTC_BOOTSTRAP to some value. Environment variables on windows can't be empty.
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/main.mk b/mk/main.mk index a5e37641220..2fa8ccf3621 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -372,7 +372,7 @@ CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATUR # Turn on feature-staging export CFG_DISABLE_UNSTABLE_FEATURES # Subvert unstable feature lints to do the self-build -export RUSTC_BOOTSTRAP +export RUSTC_BOOTSTRAP=1 endif ifdef CFG_MUSL_ROOT export CFG_MUSL_ROOT diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 7c5a0c7373f..fdd7a1ec57d 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -873,7 +873,7 @@ impl Build { /// Adds the compiler's bootstrap key to the environment of `cmd`. fn add_bootstrap_key(&self, cmd: &mut Command) { - cmd.env("RUSTC_BOOTSTRAP", ""); + cmd.env("RUSTC_BOOTSTRAP", "1"); // FIXME: Transitionary measure to bootstrap using the old bootstrap logic. // Remove this once the bootstrap compiler uses the new login in Issue #36548. cmd.env("RUSTC_BOOTSTRAP_KEY", "62b3e239"); |