diff options
| author | Ben Gamari <ben@well-typed.com> | 2019-11-22 10:28:22 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-02 03:42:14 -0500 |
| commit | 53251413348186c8fbe2bbe9c2702d274e469324 (patch) | |
| tree | 13e4c560b3a4d01e2e4c1d6b0ff6e04ed41dd142 | |
| parent | beed7c3e7c0703089a9ba4321bd3a2e442213fad (diff) | |
| download | haskell-53251413348186c8fbe2bbe9c2702d274e469324.tar.gz | |
testsuite: Don't override LD_LIBRARY_PATH, only prepend
NixOS development environments often require that LD_LIBRARY_PATH
be set in order to find system libraries. T1407 was overriding
LD_LIBRARY_PATH, dropping these directories. Now it merely prepends,
its directory.
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile index d4a65a6603..ee345e5560 100644 --- a/testsuite/tests/ghci/linking/dyn/Makefile +++ b/testsuite/tests/ghci/linking/dyn/Makefile @@ -94,7 +94,7 @@ compile_libAS_impl_msvc: .PHONY: T1407 T1407: - cat T1407.script | LD_LIBRARY_PATH=. "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -L"T1407dir" + cat T1407.script | LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -L"T1407dir" .PHONY: T3242 echo ":q" | '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) -lm |