Skip to content

Commit 9303572

Browse files
committed
Remove temporary build rules
1 parent df12749 commit 9303572

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

Makefile.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ endif
103103
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
104104
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
105105
CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd)
106-
# FIXME: temporary
107-
CFG_OLDSTDLIB :=$(call CFG_LIB_NAME,std)
108106
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
109107

110108
# version-string calculation

mk/host.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ $$(HOST_LIB$(2))/$$(CFG_STDLIB): \
3838
@$$(call E, cp: $$@)
3939
$$(Q)cp $$< $$@
4040

41-
# FIXME: temporary
42-
ifeq ($(2),0)
43-
$$(HOST_LIB$(2))/$$(CFG_OLDSTDLIB): \
44-
$$(HOST_LIB$(2))/$$(CFG_STDLIB)
45-
@$$(call E, cp: $$@)
46-
$$(Q)cp $$< $$@
47-
endif
48-
4941
$$(HOST_LIB$(2))/libstd.rlib: \
5042
$$(TARGET_HOST_LIB$(1))/libstd.rlib \
5143
$$(HOST_LIB$(2))/$$(CFG_RUNTIME)

mk/target.mk

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,13 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
3838
@$$(call E, cp: $$@)
3939
$$(Q)cp $$< $$@
4040

41-
ifeq ($(1), 0)
42-
$$(TARGET_BIN$(1)$(2))/rustc$$(X): \
43-
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
44-
$$(TARGET_SREQ$(1)$(2)) \
45-
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
46-
$$(TARGET_STDLIB_DEFAULT$(1)$(2)) \
47-
$$(TARGET_LIB$(1)$(2))/$$(CFG_OLDSTDLIB)
48-
@$$(call E, compile_and_link: $$@)
49-
$$(STAGE$(1)) -o $$@ $$<
50-
else
5141
$$(TARGET_BIN$(1)$(2))/rustc$$(X): \
5242
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
5343
$$(TARGET_SREQ$(1)$(2)) \
5444
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
5545
$$(TARGET_STDLIB_DEFAULT$(1)$(2))
5646
@$$(call E, compile_and_link: $$@)
5747
$$(STAGE$(1)) -o $$@ $$<
58-
endif
5948

6049
$$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \
6150
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \

0 commit comments

Comments
 (0)