OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove makefile CFG_USE_SNAP_LIBS_FOR_STAGE1 hack 

It didn't work as intended, due to my lack of Makefile-fu
This commit is contained in:
Marijn Haverbeke 2011-08-29 14:31:32 +02:00
parent c9c5ee252a
commit 49e59e4ba7
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -57,13 +57,6 @@ else
CFG_STDLIB_DEFAULT = $(2)/$(CFG_STDLIB)
endif
# Uncomment this to temporarily use the snapshot's runtime for stage1.
# This is useful when making incompatible changes to the parts of the
# runtime used directly by the compiler -- the binaries built by the
# snapshot won't know about the changes yet. Don't leave this on. Turn
# it on, shapshot, and turn it off again.
CFG_USE_SNAP_LIBS_FOR_STAGE1 = 1
# version-string calculation
CFG_GIT_DIR := $(CFG_SRC_DIR).git
CFG_VERSION = prerelease

26
mk/stageN.mk
View File

@ -8,15 +8,6 @@
# new rustrt in stage0/lib/.
define LIBGEN
ifdef CFG_USE_SNAP_LIBS_FOR_STAGE1
ifeq ($(2), 0)
RUNTIME_SOURCE = stage0/$(CFG_RUNTIME)
stage$(2)/lib/$$(CFG_STDLIB): stage0/$$(CFG_STDLIB)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
else
RUNTIME_SOURCE = rt/$(CFG_RUNTIME)
stage$(2)/lib/$$(CFG_STDLIB): $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
stage$(2)/rustc$$(X) \
stage$(2)/$$(CFG_RUNTIME) \
@ -25,8 +16,6 @@ stage$(2)/lib/$$(CFG_STDLIB): $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
$$(SREQ$(1))
@$$(call E, compile_and_link: $$@)
$$(STAGE$(2)) --lib -o $$@ $$<
endif
endif
stage$(2)/lib/libstd.rlib: $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
stage$(2)/rustc$$(X) \
@ -37,7 +26,7 @@ stage$(2)/lib/libstd.rlib: $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
@$$(call E, compile_and_link: $$@)
$$(STAGE$(2)) --lib --static -o $$@ $$<
stage$(2)/lib/$$(CFG_RUNTIME): $$(RUNTIME_SOURCE)
stage$(2)/lib/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
@ -69,20 +58,11 @@ stage$(2)/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
@$$(call E, compile_and_link: $$@)
$$(STAGE$(1)) -L stage$(2) -o $$@ $$<
RUNTIME_SOURCE = rt/$(CFG_RUNTIME)
STDLIB_SOURCE = stage$(1)/lib/$$(CFG_STDLIB)
ifdef CFG_USE_SNAP_LIBS_FOR_STAGE1
ifeq ($(2), 1)
RUNTIME_SOURCE = stage0/$(CFG_RUNTIME)
STDLIB_SOURCE = stage0/$(CFG_STDLIB)
endif
endif
stage$(2)/$$(CFG_RUNTIME): $$(RUNTIME_SOURCE)
stage$(2)/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
stage$(2)/$$(CFG_STDLIB): $$(STDLIB_SOURCE)
stage$(2)/$$(CFG_STDLIB): stage$(1)/lib/$$(CFG_STDLIB)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@