diff options
| author | bors <bors@rust-lang.org> | 2014-07-06 23:06:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-06 23:06:34 +0000 |
| commit | 21ef888bb798f2ebd8773d3b95b098ba18f0dbd6 (patch) | |
| tree | f4433b955c25411d4e89dc79f6f9274cd9ca4615 | |
| parent | c97f885aee24dc28b82aa9d7a7d118d59c02ecbf (diff) | |
| parent | 6d4d83c94d6e7ee726351317050998f662d74e7b (diff) | |
| download | rust-21ef888bb798f2ebd8773d3b95b098ba18f0dbd6.tar.gz rust-21ef888bb798f2ebd8773d3b95b098ba18f0dbd6.zip | |
auto merge of #15481 : alexcrichton/rust/fix-nightly, r=luqmana
The stage0 compiler for a non-CFG_BUILD architecture needs to have the new `-C extra-filename` argument passed.
| -rw-r--r-- | mk/target.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mk/target.mk b/mk/target.mk index b7a570e3275..1bdbf53af7e 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -44,13 +44,6 @@ $(foreach host,$(CFG_HOST), \ $(foreach crate,$(CRATES), \ $(eval $(call RUST_CRATE_FULLDEPS,$(stage),$(target),$(host),$(crate))))))) -# NOTE: after a stage0 snap this should be just EXTRA_FILENAME, not with a stage -# bound -EXTRA_FILENAME_0 = -EXTRA_FILENAME_1 = -C extra-filename=-$(CFG_FILENAME_EXTRA) -EXTRA_FILENAME_2 = -C extra-filename=-$(CFG_FILENAME_EXTRA) -EXTRA_FILENAME_3 = -C extra-filename=-$(CFG_FILENAME_EXTRA) - # RUST_TARGET_STAGE_N template: This defines how target artifacts are built # for all stage/target architecture combinations. This is one giant rule which # works as follows: @@ -75,6 +68,15 @@ EXTRA_FILENAME_3 = -C extra-filename=-$(CFG_FILENAME_EXTRA) # $(4) is the crate name define RUST_TARGET_STAGE_N +# NOTE: after a stage0 snap this should be just EXTRA_FILENAME, not with a stage +# or target bound +EXTRA_FILENAME_$(1)_$(2) = -C extra-filename=-$$(CFG_FILENAME_EXTRA) +ifeq ($(1),0) +ifeq ($$(CFG_BUILD),$(2)) +EXTRA_FILENAME_$(1)_$(2) = +endif +endif + $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2) $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(CRATEFILE_$(4)) \ @@ -93,7 +95,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ -L "$$(dir $$(LLVM_STDCPP_LOCATION_$(2)))" \ $$(RUSTFLAGS_$(4)) \ --out-dir $$(@D) \ - $$(EXTRA_FILENAME_$(1)) \ + $$(EXTRA_FILENAME_$(1)_$(2)) \ $$< @touch $$@ $$(call LIST_ALL_OLD_GLOB_MATCHES,\ |