]> git.lizzy.rs Git - rust.git/commitdiff
test: readd TMPDIR to LD_LIBRARY_PATH for run-make
authorBenjamin Herr <ben@0x539.de>
Mon, 23 Jun 2014 11:12:37 +0000 (13:12 +0200)
committerBenjamin Herr <ben@0x539.de>
Mon, 23 Jun 2014 11:12:37 +0000 (13:12 +0200)
It was accidentally removed in #15006 and that somehow got past the
build bots, causing `src/test/run-make/c-dynamic-dylib` to fail on at
least my linux system.

This resolves #15103 (thanks to @alexcrichton!).

src/test/run-make/tools.mk

index d4862e1570434ae960563e9324351eef328c38e4..f5027618814a9883f241fe53c8bc91749f661fc5 100644 (file)
@@ -1,9 +1,9 @@
 # These deliberately use `=` and not `:=` so that client makefiles can
 # augment HOST_RPATH_DIR / TARGET_RPATH_DIR.
 HOST_RPATH_ENV = \
-    $(LD_LIB_PATH_ENVVAR)="$(HOST_RPATH_DIR):$($(LD_LIB_PATH_ENVVAR))"
+    $(LD_LIB_PATH_ENVVAR)="$(TMPDIR):$(HOST_RPATH_DIR):$($(LD_LIB_PATH_ENVVAR))"
 TARGET_RPATH_ENV = \
-    $(LD_LIB_PATH_ENVVAR)="$(TARGET_RPATH_DIR):$($(LD_LIB_PATH_ENVVAR))"
+    $(LD_LIB_PATH_ENVVAR)="$(TMPDIR):$(TARGET_RPATH_DIR):$($(LD_LIB_PATH_ENVVAR))"
 
 RUSTC := $(HOST_RPATH_ENV) $(RUSTC) --out-dir $(TMPDIR) -L $(TMPDIR)
 CC := $(CC) -L $(TMPDIR)