diff options
| author | Benjamin Herr <ben@0x539.de> | 2014-06-23 13:12:37 +0200 |
|---|---|---|
| committer | Benjamin Herr <ben@0x539.de> | 2014-06-23 13:12:37 +0200 |
| commit | 17108207b13894cadae5eb80a4ed7b374755ba9b (patch) | |
| tree | 4e068ac003ca5f49a5c71fbed75fc37fa0a25a76 | |
| parent | ca3e557ee8a6451847b3bf6024175a2fe4601737 (diff) | |
| download | rust-17108207b13894cadae5eb80a4ed7b374755ba9b.tar.gz rust-17108207b13894cadae5eb80a4ed7b374755ba9b.zip | |
test: readd TMPDIR to LD_LIBRARY_PATH for run-make
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!).
| -rw-r--r-- | src/test/run-make/tools.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk index d4862e15704..f5027618814 100644 --- a/src/test/run-make/tools.mk +++ b/src/test/run-make/tools.mk @@ -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) |