Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 234aa8ca by Sven Tennie at 2026-02-21T15:23:08+01:00 Delete targetSupportsGhciObjects - - - - - 2 changed files: - hadrian/src/Oracles/Flag.hs - hadrian/src/Rules/Library.hs Changes: ===================================== hadrian/src/Oracles/Flag.hs ===================================== @@ -1,11 +1,8 @@ -{-# LANGUAGE MultiWayIf #-} - module Oracles.Flag ( Flag (..), flag, getFlag, BuildFlag(..), buildFlag, targetRTSLinkerOnlySupportsSharedLibs, targetSupportsSharedLibs, - targetSupportsGhciObjects, targetSupportsThreadedRts, targetSupportsSMP, useLibdw, @@ -86,14 +83,6 @@ buildFlag f st = getFlag :: Flag -> Expr c b Bool getFlag = expr . flag --- | Does the target platform support object merging (and therefore we can build GHCi objects --- when appropriate). -targetSupportsGhciObjects :: Stage -> Action Bool -targetSupportsGhciObjects stage = do - has_merge_objs <- isJust <$> queryTargetTarget stage tgtMergeObjs - only_shared_libs <- targetRTSLinkerOnlySupportsSharedLibs stage - pure $ has_merge_objs && not only_shared_libs - targetRTSLinkerOnlySupportsSharedLibs :: Stage -> Action Bool targetRTSLinkerOnlySupportsSharedLibs s = queryTargetTarget s Toolchain.tgtRTSLinkerOnlySupportsSharedLibs ===================================== hadrian/src/Rules/Library.hs ===================================== @@ -140,7 +140,7 @@ buildPackage root fp = do ways <- interpretInContext ctx getLibraryWays let hasVanilla = elem vanilla ways hasDynamic = elem dynamic ways - support <- targetSupportsGhciObjects stage + support <- targetSupportsSharedLibs stage when ((hasVanilla && hasDynamic) && support && way == vanilla) $ do stamp <- (pkgStampFile (ctx { way = dynamic })) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/234aa8ca794d56c3a550811f1d3218dd... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/234aa8ca794d56c3a550811f1d3218dd... You're receiving this email because of your account on gitlab.haskell.org.