@@ -448,7 +448,7 @@ installUnpackedGHC path inst tver forceInstall addConfArgs
448
448
lEM $ execLogged " sh"
449
449
(" ./configure" : (" --prefix=" <> fromInstallDir inst)
450
450
: (maybe mempty (\ x -> [" --target=" <> T. unpack x]) (_tvTarget tver)
451
- <> ldOverride (_tvVersion tver)
451
+ <> ldOverride (_tvVersion tver) _rPlatform
452
452
<> defGHCConfOptions'
453
453
<> addConfArgs')
454
454
)
@@ -1299,6 +1299,7 @@ compileGHC targetGhc crossTarget vps bstrap hghc jobs mbuildConfig patches aargs
1299
1299
m
1300
1300
()
1301
1301
configureBindist tver workdir (fromInstallDir -> ghcdir) = do
1302
+ PlatformRequest { .. } <- lift getPlatformReq
1302
1303
lift $ logInfo [s |configuring build|]
1303
1304
liftE $ configureWithGhcBoot (Just tver)
1304
1305
(maybe mempty
@@ -1307,7 +1308,7 @@ compileGHC targetGhc crossTarget vps bstrap hghc jobs mbuildConfig patches aargs
1307
1308
++ [" --prefix=" <> ghcdir]
1308
1309
++ (if isWindows then [" --enable-tarballs-autodownload" ] else [] )
1309
1310
-- https://github.com/haskell/ghcup-hs/issues/1032
1310
- ++ ldOverride (_tvVersion tver)
1311
+ ++ ldOverride (_tvVersion tver) _rPlatform
1311
1312
++ fmap T. unpack aargs
1312
1313
)
1313
1314
(Just workdir)
@@ -1388,9 +1389,10 @@ postGHCInstall ver@GHCTargetVersion {..} = do
1388
1389
>>= mapM_ (\ v -> liftE $ setGHC v SetGHC_XY Nothing )
1389
1390
1390
1391
1391
- ldOverride :: Version -> [String ]
1392
- ldOverride ver
1392
+ ldOverride :: Version -> Platform -> [String ]
1393
+ ldOverride ver plat
1393
1394
| ver >= [vver |8.2.2|]
1395
+ , plat `elem` [Linux Alpine , Darwin ]
1394
1396
= [" --disable-ld-override" ]
1395
1397
| otherwise
1396
1398
= []
0 commit comments