diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-16 22:31:31 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-17 16:37:34 -0800 |
| commit | fa1d63acd3c144ffe53766686090c3fb3a551c8d (patch) | |
| tree | 7bb4ba1390d12a91ef3f928e50611edfa534e7a2 | |
| parent | 89b80faa8ef2b52f5adc423cfcfed69b313ea1b7 (diff) | |
| download | rust-fa1d63acd3c144ffe53766686090c3fb3a551c8d.tar.gz rust-fa1d63acd3c144ffe53766686090c3fb3a551c8d.zip | |
mk: Revert hack to pull the bootstrap key from the snapshot bins
| -rw-r--r-- | mk/main.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mk/main.mk b/mk/main.mk index 8e3b19ad70a..46cbe34904d 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -333,6 +333,7 @@ export CFG_DISABLE_UNSTABLE_FEATURES endif # Subvert unstable feature lints to do the self-build export CFG_BOOTSTRAP_KEY +export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY) ###################################################################### # Per-stage targets and runner @@ -403,13 +404,8 @@ CSREQ$(1)_T_$(2)_H_$(3) = \ ifeq ($(1),0) # Don't run the stage0 compiler under valgrind - that ship has sailed CFG_VALGRIND_COMPILE$(1) = -# FIXME(21230) HACK Extract the key from the snapshot -CFG_BOOSTRAP_KEY_ENV$(1) = RUSTC_BOOTSTRAP_KEY=$$$$((grep -a 'save analysis[0-9]' \ - $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) || echo N) |\ - sed 's/.*save analysis\([0-9]*\).*/\1/') else CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE) -CFG_BOOSTRAP_KEY_ENV$(1) = RUSTC_BOOTSTRAP_KEY=$$(CFG_BOOTSTRAP_KEY) endif # Add RUSTFLAGS_STAGEN values to the build command @@ -482,7 +478,6 @@ STAGE$(1)_T_$(2)_H_$(3) := \ $$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \ $$(call CFG_RUN_TARG_$(3),$(1), \ $$(CFG_VALGRIND_COMPILE$(1)) \ - $$(CFG_BOOSTRAP_KEY_ENV$(1)) \ $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ --cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \ $$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \ |