diff options
| author | bors <bors@rust-lang.org> | 2014-01-08 08:46:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-08 08:46:33 -0800 |
| commit | f3a8baafbecdb6e41f001c8f218d4796a9ca8d40 (patch) | |
| tree | 7d98783502ac9684a3bc11bff1b07e87880f06e0 | |
| parent | 464d1d044eebace50d17c10731493d6898490876 (diff) | |
| parent | 004dae6abd5733beda47b54c0e2d3e883de558a6 (diff) | |
| download | rust-f3a8baafbecdb6e41f001c8f218d4796a9ca8d40.tar.gz rust-f3a8baafbecdb6e41f001c8f218d4796a9ca8d40.zip | |
auto merge of #11407 : alexcrichton/rust/fix-snap, r=brson
If we bootstrap a cross compile from a stage1 compiler, then the stage1 compiler already knows about the rustc => rustlib change, so we need to not add the extra flag if it's a stage0 version of a target from a stage1 of another target.
| -rw-r--r-- | mk/target.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mk/target.mk b/mk/target.mk index 59882e63bfd..02c5d028e2c 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -56,7 +56,11 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)): \ # SNAP a5fa1d9 remove this after the stage0 snapshot from rules below ifeq ($(1),0) +ifeq ($(3),$$(findstring $(3),$$(NON_BUILD_HOST))) +LFLAGS_$(1)_$(2)_$(3) := +else LFLAGS_$(1)_$(2)_$(3) := -L $$(TLIB$(1)_T_$(2)_H_$(3)) +endif else LFLAGS_$(1)_$(2)_$(3) := endif |