Skip to content
Snippets Groups Projects

Add --disable-ld-override for darwin bindists

Merged Julian Ospald requested to merge issue-391 into master
1 file
+ 4
3
Compare changes
  • Side-by-side
  • Inline
+ 4
3
@@ -301,8 +301,9 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
@@ -301,8 +301,9 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
| otherwise = do
| otherwise = do
PlatformRequest {..} <- lift getPlatformReq
PlatformRequest {..} <- lift getPlatformReq
let alpineArgs
let ldOverride
| ver >= [vver|8.2.2|], Linux Alpine <- _rPlatform
| ver >= [vver|8.2.2|]
 
, _rPlatform `elem` [Linux Alpine, Darwin]
= ["--disable-ld-override"]
= ["--disable-ld-override"]
| otherwise
| otherwise
= []
= []
@@ -310,7 +311,7 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
@@ -310,7 +311,7 @@ installUnpackedGHC path inst ver forceInstall addConfArgs
lift $ logInfo "Installing GHC (this may take a while)"
lift $ logInfo "Installing GHC (this may take a while)"
lEM $ execLogged "sh"
lEM $ execLogged "sh"
("./configure" : ("--prefix=" <> fromInstallDir inst)
("./configure" : ("--prefix=" <> fromInstallDir inst)
: (alpineArgs <> (T.unpack <$> addConfArgs))
: (ldOverride <> (T.unpack <$> addConfArgs))
)
)
(Just $ fromGHCupPath path)
(Just $ fromGHCupPath path)
"ghc-configure"
"ghc-configure"
Loading