diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-07-21 23:54:48 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-07-22 10:18:28 -0700 |
| commit | 6fc33163dcbd3dba8405ab5a9977e22479e81d76 (patch) | |
| tree | d44f92768bbb2157030bf88f8bc321d03e51369c | |
| parent | e891e0b9924f5c5a4d417b6741d1001bc4f71ec5 (diff) | |
| download | rust-6fc33163dcbd3dba8405ab5a9977e22479e81d76.tar.gz rust-6fc33163dcbd3dba8405ab5a9977e22479e81d76.zip | |
Change the CFG_STDLIB_DEFAULT macro into a call that picks the correct stage
stageN/rustc depends on either stageN/libstd.so or stage(N-1)/lib/libstd.rlib so CFG_STDLIB_DEFAULT needs to try harder to get the dependencies right.
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | mk/stageN.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index cc265795ce8..df0ac6c9960 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,9 +50,9 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std) CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc) ifdef CFG_DISABLE_SHAREDSTD - CFG_STDLIB_DEFAULT := lib/libstd.rlib + CFG_STDLIB_DEFAULT = $(1)/lib/libstd.rlib else - CFG_STDLIB_DEFAULT := $(CFG_STDLIB) + CFG_STDLIB_DEFAULT = $(2)/$(CFG_STDLIB) endif # version-string calculation @@ -165,7 +165,7 @@ define SREQ ifdef CFG_DISABLE_SHAREDSTD SREQ$(1) = stage$(1)/rustc$(X) \ stage$(1)/$$(CFG_RUNTIME) \ - stage$(1)/$$(CFG_STDLIB_DEFAULT) \ + $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \ stage$(1)/$$(CFG_RUSTLLVM) \ stage$(1)/lib/glue.o \ stage$(1)/lib/main.o \ @@ -174,7 +174,7 @@ SREQ$(1) = stage$(1)/rustc$(X) \ else SREQ$(1) = stage$(1)/rustc$(X) \ stage$(1)/$$(CFG_RUNTIME) \ - stage$(1)/$$(CFG_STDLIB_DEFAULT) \ + $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \ stage$(1)/$$(CFG_RUSTLLVM) \ stage$(1)/lib/glue.o \ stage$(1)/lib/main.o \ diff --git a/mk/stageN.mk b/mk/stageN.mk index 1338f1ae30f..171b954d9a7 100644 --- a/mk/stageN.mk +++ b/mk/stageN.mk @@ -50,10 +50,10 @@ stage$(2)/%.o: stage$(2)/%.s @$$(call E, assemble [gcc]: $$@) $$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$< -stage$(2)/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ - stage$(2)/$$(CFG_RUNTIME) \ - stage$(1)/$$(CFG_STDLIB_DEFAULT) \ - stage$(2)/$$(CFG_RUSTLLVM) \ +stage$(2)/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ + stage$(2)/$$(CFG_RUNTIME) \ + $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \ + stage$(2)/$$(CFG_RUSTLLVM) \ $$(SREQ$(1)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)) -L stage$(2) -o $$@ $$< |