aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-03-18 18:30:57 -0700
committerGraydon Hoare <[email protected]>2011-03-18 18:33:22 -0700
commit29d7cb88335845ce22e019d091ed1332af531650 (patch)
tree8f8edf3a42e1f27d5ad30ec91dfbb65fc36c8715
parentPoint valgrind suppressions file to srcdir. (diff)
downloadrust-29d7cb88335845ce22e019d091ed1332af531650.tar.xz
rust-29d7cb88335845ce22e019d091ed1332af531650.zip
Run rustc stages using proper LD_LIBRARY_PATH.
-rw-r--r--Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index eddeecc8..b273884f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ ifdef CFG_UNIXY
CFG_VALGRIND += --leak-check=full \
--error-exitcode=1 \
--quiet --vex-iropt-level=0 \
- --suppressions=$(S)src/etc/x86.supp
+ --suppressions=etc/x86.supp
endif
endif
@@ -174,8 +174,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 stage0
-STAGE0 := $(Q)stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1
-STAGE1 := $(Q)stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage2
+STAGE0 := $(Q)$(CFG_RUN_PROGRAM) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1
+STAGE1 := $(Q)$(CFG_RUN_PROGRAM) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage2
# "Source" files we generate in builddir along the way.
GENERATED := boot/fe/lexer.ml boot/version.ml