diff options
author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-13 16:44:19 +0800 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-29 17:25:49 -0400 |
commit | e754ff7f178a629a2261cba77a29d9510391aebd (patch) | |
tree | 77aca9f315288b52efbc9d410a57300a4029279d /utils/ghc-cabal | |
parent | 4421fb34b3a70db1323833337c94ac4364824124 (diff) | |
download | haskell-e754ff7f178a629a2261cba77a29d9510391aebd.tar.gz |
Allocate Adjustors and mark them readable in two steps
This drops allocateExec for darwin, and replaces it with
a alloc, write, mark executable strategy instead. This prevents
us from trying to allocate an executable range and then write to
it, which X^W will prohibit on darwin.
This will *only* work if we can use mmap.
Diffstat (limited to 'utils/ghc-cabal')
-rw-r--r-- | utils/ghc-cabal/Main.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 78efc133f1..3e3b824a26 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -385,7 +385,7 @@ generate directory distdir config_args transitiveDepLibNames | packageKeySupported comp = map fixupRtsLibName transitiveDeps | otherwise = transitiveDeps - fixupRtsLibName "rts-1.0" = "rts" + fixupRtsLibName x | "rts-" `isPrefixOf` x = "rts" fixupRtsLibName x = x transitiveDepNames = map (display . packageName) transitive_dep_ids |