bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove temporary build rules

Browse source
This commit is contained in:
Brian Anderson 2011-10-31 15:17:32 -07:00
parent df12749b36
commit 93035722a4
3 changed files with 0 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -103,8 +103,6 @@ endif
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt) CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm) CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd) CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd)
# FIXME: temporary
CFG_OLDSTDLIB :=$(call CFG_LIB_NAME,std)
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc) CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
# version-string calculation # version-string calculation

8
mk/host.mk
View file

@ -38,14 +38,6 @@ $$(HOST_LIB$(2))/$$(CFG_STDLIB): \
@$$(call E, cp: $$@) @$$(call E, cp: $$@)
$$(Q)cp $$< $$@ $$(Q)cp $$< $$@
# FIXME: temporary
ifeq ($(2),0)
$$(HOST_LIB$(2))/$$(CFG_OLDSTDLIB): \
$$(HOST_LIB$(2))/$$(CFG_STDLIB)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
endif
$$(HOST_LIB$(2))/libstd.rlib: \ $$(HOST_LIB$(2))/libstd.rlib: \
$$(TARGET_HOST_LIB$(1))/libstd.rlib \ $$(TARGET_HOST_LIB$(1))/libstd.rlib \
$$(HOST_LIB$(2))/$$(CFG_RUNTIME) $$(HOST_LIB$(2))/$$(CFG_RUNTIME)

11
mk/target.mk
View file

@ -38,16 +38,6 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
@$$(call E, cp: $$@) @$$(call E, cp: $$@)
$$(Q)cp $$< $$@ $$(Q)cp $$< $$@
ifeq ($(1), 0)
$$(TARGET_BIN$(1)$(2))/rustc$$(X): \
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
$$(TARGET_SREQ$(1)$(2)) \
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
$$(TARGET_STDLIB_DEFAULT$(1)$(2)) \
$$(TARGET_LIB$(1)$(2))/$$(CFG_OLDSTDLIB)
@$$(call E, compile_and_link: $$@)
$$(STAGE$(1)) -o $$@ $$<
else
$$(TARGET_BIN$(1)$(2))/rustc$$(X): \ $$(TARGET_BIN$(1)$(2))/rustc$$(X): \
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
$$(TARGET_SREQ$(1)$(2)) \ $$(TARGET_SREQ$(1)$(2)) \
@ -55,7 +45,6 @@ $$(TARGET_BIN$(1)$(2))/rustc$$(X): \
$$(TARGET_STDLIB_DEFAULT$(1)$(2)) $$(TARGET_STDLIB_DEFAULT$(1)$(2))
@$$(call E, compile_and_link: $$@) @$$(call E, compile_and_link: $$@)
$$(STAGE$(1)) -o $$@ $$< $$(STAGE$(1)) -o $$@ $$<
endif
$$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \ $$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \