summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-03-06 23:31:40 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2021-04-20 15:52:30 +0800
commit07f8e38f39af84601bb663460de0c5227d8b54e5 (patch)
tree27cb5e022dbceb4bc6d6a1e825325327d0f7dd73
parenta89a6150579075ff4d1f5f2c38567d1b754bd09a (diff)
downloadhaskell-07f8e38f39af84601bb663460de0c5227d8b54e5.tar.gz
[darwin] stop the DYLD_LIBRARY_PATH madnesswip/angerman/9.2-forward-ports-2
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.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index d4425b5da5..ac0d4f7100 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()