diff options
| author | Brian Anderson <banderson@mozilla.com> | 2016-11-03 22:15:43 +0000 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2016-11-03 22:18:00 +0000 |
| commit | e7c54699e27dcdb8b903d9dc106c091fc0df3bb1 (patch) | |
| tree | 39c5513ae86cd7d90581698faf7cea740cc9d537 | |
| parent | 5f7cfd194e579831484a523d0a744d9ad44a956f (diff) | |
| download | rust-e7c54699e27dcdb8b903d9dc106c091fc0df3bb1.tar.gz rust-e7c54699e27dcdb8b903d9dc106c091fc0df3bb1.zip | |
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 8d95bf6ed8d..45c085c27c9 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -368,7 +368,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 4dea0e3f9e7..32232cbee98 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -863,7 +863,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", "5c6cf767"); |