diff --git a/Makefile.in b/Makefile.in index 744bb8ccb36..648acee5263 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,8 +103,6 @@ endif CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt) CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm) CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd) -# FIXME: temporary -CFG_OLDSTDLIB :=$(call CFG_LIB_NAME,std) CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc) # version-string calculation diff --git a/mk/host.mk b/mk/host.mk index 8b8c7961da2..31e995d22c6 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -38,14 +38,6 @@ $$(HOST_LIB$(2))/$$(CFG_STDLIB): \ @$$(call E, 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: \ $$(TARGET_HOST_LIB$(1))/libstd.rlib \ $$(HOST_LIB$(2))/$$(CFG_RUNTIME) diff --git a/mk/target.mk b/mk/target.mk index 1dc59e9f8e3..9f0739bfb7a 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -38,16 +38,6 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM) @$$(call E, 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): \ $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ $$(TARGET_SREQ$(1)$(2)) \ @@ -55,7 +45,6 @@ $$(TARGET_BIN$(1)$(2))/rustc$$(X): \ $$(TARGET_STDLIB_DEFAULT$(1)$(2)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)) -o $$@ $$< -endif $$(TARGET_LIB$(1)$(2))/$$(CFG_LIBRUSTC): \ $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \