Skip to content

Commit 2a7f32e

Browse files
committed
Revert unconditional '--disable-ld-override' for now
1 parent 69348f0 commit 2a7f32e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

lib/GHCup/GHC.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ installUnpackedGHC path inst tver forceInstall addConfArgs
448448
lEM $ execLogged "sh"
449449
("./configure" : ("--prefix=" <> fromInstallDir inst)
450450
: (maybe mempty (\x -> ["--target=" <> T.unpack x]) (_tvTarget tver)
451-
<> ldOverride (_tvVersion tver)
451+
<> ldOverride (_tvVersion tver) _rPlatform
452452
<> defGHCConfOptions'
453453
<> addConfArgs')
454454
)
@@ -1299,6 +1299,7 @@ compileGHC targetGhc crossTarget vps bstrap hghc jobs mbuildConfig patches aargs
12991299
m
13001300
()
13011301
configureBindist tver workdir (fromInstallDir -> ghcdir) = do
1302+
PlatformRequest { .. } <- lift getPlatformReq
13021303
lift $ logInfo [s|configuring build|]
13031304
liftE $ configureWithGhcBoot (Just tver)
13041305
(maybe mempty
@@ -1307,7 +1308,7 @@ compileGHC targetGhc crossTarget vps bstrap hghc jobs mbuildConfig patches aargs
13071308
++ ["--prefix=" <> ghcdir]
13081309
++ (if isWindows then ["--enable-tarballs-autodownload"] else [])
13091310
-- https://github.com/haskell/ghcup-hs/issues/1032
1310-
++ ldOverride (_tvVersion tver)
1311+
++ ldOverride (_tvVersion tver) _rPlatform
13111312
++ fmap T.unpack aargs
13121313
)
13131314
(Just workdir)
@@ -1388,9 +1389,10 @@ postGHCInstall ver@GHCTargetVersion {..} = do
13881389
>>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY Nothing)
13891390

13901391

1391-
ldOverride :: Version -> [String]
1392-
ldOverride ver
1392+
ldOverride :: Version -> Platform -> [String]
1393+
ldOverride ver plat
13931394
| ver >= [vver|8.2.2|]
1395+
, plat `elem` [Linux Alpine, Darwin]
13941396
= ["--disable-ld-override"]
13951397
| otherwise
13961398
= []

0 commit comments

Comments
 (0)