diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2015-01-16 17:01:02 +0200 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-17 16:37:34 -0800 |
| commit | 89b80faa8ef2b52f5adc423cfcfed69b313ea1b7 (patch) | |
| tree | 6398229035eb8fac2a35fe6eb3a72d3efad3dd12 /mk | |
| parent | f4f10dba2975b51c2d2c92157018db3ac13d4d4a (diff) | |
Register new snapshots.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/main.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk index 46cbe34904d..8e3b19ad70a 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -333,7 +333,6 @@ 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 @@ -404,8 +403,13 @@ 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 @@ -478,6 +482,7 @@ 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)) \ |