diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-06 23:31:40 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-05-07 09:19:48 +0800 |
| commit | cceb461a8cd8d48a077eabceab1907d874ba4852 (patch) | |
| tree | 8a4ee591390ed9813d101e69cc02ac1de4691a42 | |
| parent | ccea61173679b8e26b09fd2d3d1f35cfb078df6c (diff) | |
| download | haskell-cceb461a8cd8d48a077eabceab1907d874ba4852.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)
| -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 39256aee5f..98d6c134b9 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -266,7 +266,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: @@ -284,12 +284,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() |