diff options
| -rw-r--r-- | Makefile.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index d4958d683b0..1478aeff919 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ ifdef CFG_WINDOWSY CFG_LIB_NAME=$(1).dll CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR) CFG_LDPATH :=$(CFG_LDPATH):$$PATH + CFG_RUN_TEST=PATH=$(CFG_LDPATH) $(1) CFG_RUN_TARG=PATH=$(CFG_LDPATH) $(1) CFG_PATH_MUNGE := $(strip | perl -p \ @@ -88,6 +89,8 @@ ifdef CFG_UNIXY CFG_EXE_SUFFIX := CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR) CFG_RUN_TARG=\ + LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(1) + CFG_RUN_TEST=\ LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(CFG_VALGRIND) $(1) CFG_BOOT_NATIVE := 1 @@ -98,6 +101,7 @@ ifdef CFG_UNIXY CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR) CFG_LDPATH :=$(CFG_LDPATH):$$PATH CFG_RUN_TARG=PATH=$(CFG_LDPATH) $(1) + CFG_RUN_TEST=PATH=$(CFG_LDPATH) $(1) CFG_INFO := $(info cfg: mingw-cross) CFG_GCC_CROSS := i586-mingw32msvc- @@ -179,6 +183,7 @@ else endif R := $(CFG_RUN_TARG) +T := $(CFG_RUN_TEST) S := $(CFG_SRC_DIR) X := $(CFG_EXE_SUFFIX) @@ -187,8 +192,8 @@ VPATH := $(S)doc $(S)src # Compilers we build, we now know how to run. BOOT := $(Q)OCAMLRUNPARAM="b1" boot/rustboot$(X) $(CFG_BOOT_FLAGS) -L boot -STAGE0 := $(Q)$(CFG_RUN_TARG) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0 -STAGE1 := $(Q)$(CFG_RUN_TARG) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1 +STAGE0 := $(Q)$(R) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0 +STAGE1 := $(Q)$(R) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1 # "Source" files we generate in builddir along the way. GENERATED := boot/fe/lexer.ml boot/version.ml @@ -554,19 +559,19 @@ llvmext/%.o: llvmext/%.cpp $(MKFILES) test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) rt/$(CFG_RUNTIME) $(Q)rm -f $<.tmp @$(call E, run: $@) - $(Q)$(call CFG_RUN_TARG, $<) > $@ + $(Q)$(call T, $<) > $@ test/bench/shootout/%.out.tmp: test/bench/shootout/%$(X) \ rt/$(CFG_RUNTIME) $(Q)rm -f $<.tmp @$(call E, run: $@) - $(Q)$(call CFG_RUN_TARG, $<) > $@ + $(Q)$(call T, $<) > $@ test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(X) \ rt/$(CFG_RUNTIME) $(Q)rm -f $<.tmp @$(call E, run: $@) - $(Q)$(call CFG_RUN_TARG, $<) > $@ + $(Q)$(call T, $<) > $@ test/run-fail/%.out.tmp: test/run-fail/%$(X) \ rt/$(CFG_RUNTIME) @@ -574,7 +579,7 @@ test/run-fail/%.out.tmp: test/run-fail/%$(X) \ @$(call E, run: $@) $(Q)grep -q error-pattern $(S)src/test/run-fail/$(basename $*).rs $(Q)rm -f $@ - $(Q)$(call CFG_RUN_TARG, $<) >$@ 2>&1 ; X=$$? ; \ + $(Q)$(call T, $<) >$@ 2>&1 ; X=$$? ; \ if [ $$X -eq 0 ] ; then exit 1 ; else exit 0 ; fi $(Q)grep --text --quiet \ "$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \ |