Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 10c94ce9 by Sven Tennie at 2026-01-10T13:11:39+01:00 Always refer to default.host.target for the host's Target Otherwise, arguments get messed and mixed up. - - - - - 1 changed file: - hadrian/src/Hadrian/Oracles/TextFile.hs Changes: ===================================== hadrian/src/Hadrian/Oracles/TextFile.hs ===================================== @@ -125,18 +125,7 @@ getBuildTarget = getTargetConfig buildTargetFile -- | Get the host target configuration through 'getTargetConfig' getHostTarget :: Action Toolchain.Target -getHostTarget = do - -- MP: If we are not cross compiling then we should use the target file in order to - -- build things for the host, in particular we want to use the configured values for the - -- target for building the RTS (ie are we using Libffi for adjustors, and the wordsize) - -- TODO: Use "flag CrossCompiling" - ht <- getTargetConfig hostTargetFile - tt <- getTargetConfig targetTargetFile - if (Toolchain.targetPlatformTriple ht) == (Toolchain.targetPlatformTriple tt) - then return tt - else return ht - -- where - -- msg = "The host's target configuration file " ++ quote hostTargetFile ++ " does not exist! ghc-toolchain might have failed to generate it." +getHostTarget = getTargetConfig hostTargetFile -- | Get the target target configuration through 'getTargetConfig' getTargetTarget :: Action Toolchain.Target View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/10c94ce97d7f875b3b0865beecd80ebe... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/10c94ce97d7f875b3b0865beecd80ebe... You're receiving this email because of your account on gitlab.haskell.org.