Finish the transition to having the std library in stageN/lib.
This commit is contained in:
parent
97cf57adc1
commit
164230dcb6
|
@ -109,7 +109,7 @@ VPATH := $(S)doc $(S)src
|
||||||
|
|
||||||
# Compilers we build, we now know how to run.
|
# Compilers we build, we now know how to run.
|
||||||
STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,\
|
STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,\
|
||||||
stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0)
|
stage0/rustc$(X) $(CFG_RUSTC_FLAGS))
|
||||||
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage0, \
|
STAGE1 := $(Q)$(call CFG_RUN_TARG,stage0, \
|
||||||
$(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
|
$(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
|
||||||
$(CFG_RUSTC_FLAGS))
|
$(CFG_RUSTC_FLAGS))
|
||||||
|
|
|
@ -67,7 +67,7 @@ CFG_LDPATH :=$(CFG_BUILD_DIR)/rt
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_BUILD_DIR)/rustllvm
|
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_BUILD_DIR)/rustllvm
|
||||||
CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
|
CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
|
||||||
$(if $(findstring stage0,$(1)), \
|
$(if $(findstring stage0,$(1)), \
|
||||||
stage0, \
|
stage0/lib, \
|
||||||
$(if $(findstring stage1,$(1)), \
|
$(if $(findstring stage1,$(1)), \
|
||||||
stage1/lib, \
|
stage1/lib, \
|
||||||
$(if $(findstring stage2,$(1)),\
|
$(if $(findstring stage2,$(1)),\
|
||||||
|
@ -82,7 +82,7 @@ ifdef CFG_WINDOWSY
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
|
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
||||||
CFG_RUN_TEST=PATH="$(CFG_LDPATH):$(call CFG_TESTLIB,$(1))" $(1)
|
CFG_RUN_TEST=PATH="$(CFG_LDPATH):$(call CFG_TESTLIB,$(1))" $(1)
|
||||||
CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH)" $(2)
|
CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH)" $(2)
|
||||||
|
|
||||||
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
|
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
|
||||||
-e 's@\\(\S)@/\1@go;' \
|
-e 's@\\(\S)@/\1@go;' \
|
||||||
|
@ -98,7 +98,7 @@ ifdef CFG_UNIXY
|
||||||
CFG_PATH_MUNGE := true
|
CFG_PATH_MUNGE := true
|
||||||
CFG_EXE_SUFFIX :=
|
CFG_EXE_SUFFIX :=
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
|
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
|
||||||
CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
|
CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
|
||||||
CFG_RUN_TEST=\
|
CFG_RUN_TEST=\
|
||||||
$(CFG_LDENV)=$(call CFG_TESTLIB,$(1)):$(CFG_LDPATH) \
|
$(CFG_LDENV)=$(call CFG_TESTLIB,$(1)):$(CFG_LDPATH) \
|
||||||
$(CFG_VALGRIND) $(1)
|
$(CFG_VALGRIND) $(1)
|
||||||
|
@ -108,7 +108,7 @@ ifdef CFG_UNIXY
|
||||||
CFG_LIB_NAME=$(1).dll
|
CFG_LIB_NAME=$(1).dll
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
|
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
||||||
CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
|
CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
|
||||||
CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
|
CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
|
||||||
|
|
||||||
CFG_INFO := $(info cfg: mingw-cross)
|
CFG_INFO := $(info cfg: mingw-cross)
|
||||||
|
|
Loading…
Reference in New Issue