diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-06 23:31:40 +0800 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-09-21 11:30:38 +0530 |
| commit | 1a28bab1f2ddc52a44876c8803387e00a26f0d3d (patch) | |
| tree | 0cb50e647b48fbe1ed5935e75009a8f2af54ea40 | |
| parent | 090c744a95bc48596afacfe557cdbd2a11cc83a4 (diff) | |
| download | haskell-1a28bab1f2ddc52a44876c8803387e00a26f0d3d.tar.gz | |
[darwin] stop the DYLD_LIBRARY_PATH madness
this causes *significant* slowdown on macOS as the linker ends
up looking through all the paths. Slowdown can be as bad as
100% or more.
(cherry picked from commit 820b0766984d42c06c977a6c32da75c429106f7f)
(cherry picked from commit cceb461a8cd8d48a077eabceab1907d874ba4852)
| -rw-r--r-- | testsuite/driver/runtests.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index a7e689df3b..c1a31f8b13 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -248,7 +248,7 @@ def format_path(path): # On Windows we need to set $PATH to include the paths to all the DLLs # in order for the dynamic library tests to work. -if windows or darwin: +if windows: pkginfo = getStdout([config.ghc_pkg, 'dump']) topdir = config.libdir if windows: @@ -266,12 +266,9 @@ if windows or darwin: if path.startswith('"'): path = re.sub('^"(.*)"$', '\\1', path) path = re.sub('\\\\(.)', '\\1', path) - if windows: + path = format_path(path) ghc_env['PATH'] = os.pathsep.join([path, ghc_env.get("PATH", "")]) - else: - # darwin - ghc_env['DYLD_LIBRARY_PATH'] = os.pathsep.join([path, ghc_env.get("DYLD_LIBRARY_PATH", "")]) testopts_local.x = TestOptions() |