Add some transitional build rules for moving libstd.so to libruststd.so
This commit is contained in:
parent
d1cc00fef5
commit
86459b3517
@ -103,6 +103,8 @@ 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
|
||||
|
@ -38,6 +38,14 @@ $$(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)
|
||||
|
18
mk/target.mk
18
mk/target.mk
@ -17,6 +17,13 @@ $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB): \
|
||||
@$$(call E, compile_and_link: $$@)
|
||||
$$(STAGE$(1)) --lib -o $$@ $$<
|
||||
|
||||
ifeq ($(1), 0)
|
||||
# FIXME: temporary
|
||||
$$(TARGET_LIB$(1)$(2))/$$(CFG_OLDSTDLIB): $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB)
|
||||
@$$(call E, cp: $$@)
|
||||
$$(Q)cp $$< $$@
|
||||
endif
|
||||
|
||||
$$(TARGET_LIB$(1)$(2))/libstd.rlib: \
|
||||
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
|
||||
$$(TARGET_SREQ$(1)$(2))
|
||||
@ -31,6 +38,16 @@ $$(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)) \
|
||||
@ -38,6 +55,7 @@ $$(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) \
|
||||
|
Loading…
Reference in New Issue
Block a user