diff options
| author | David Eichmann <EichmannD@gmail.com> | 2019-03-19 11:42:27 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-03-27 07:20:09 -0400 |
| commit | 3dec527a840a8165c33579bca09740ca9cf1f4de (patch) | |
| tree | a8600ef94f5631d3076383c141029f5e696071cb | |
| parent | fb12f53c2779f15ee24786e8c3beae3133506a01 (diff) | |
| download | haskell-3dec527a840a8165c33579bca09740ca9cf1f4de.tar.gz | |
Hadrian: don't use -zorigin on darwin.
| -rw-r--r-- | hadrian/src/Settings/Builders/Ghc.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs index 92f1e68ad6..7b0011c490 100644 --- a/hadrian/src/Settings/Builders/Ghc.hs +++ b/hadrian/src/Settings/Builders/Ghc.hs @@ -99,10 +99,9 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do [ arg "-dynamic" -- TODO what about windows? , isLibrary pkg ? pure [ "-shared", "-dynload", "deploy" ] - , hostSupportsRPaths ? pure - [ "-optl-Wl,-rpath," ++ rpath - , "-optl-Wl,-zorigin" - ] + , hostSupportsRPaths ? arg ("-optl-Wl,-rpath," ++ rpath) + -- The darwin linker doesn't support/require the -zorigin option + , hostSupportsRPaths ? not darwin ? arg "-optl-Wl,-zorigin" ] , arg "-no-auto-link-packages" , nonHsMainPackage pkg ? arg "-no-hs-main" |