Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC Commits: a80b12b5 by mangoiv at 2026-08-24T16:02:08+02:00 fixup! ci: build and test stage - - - - - 1 changed file: - hadrian/src/Rules/Test.hs Changes: ===================================== hadrian/src/Rules/Test.hs ===================================== @@ -21,6 +21,7 @@ import qualified System.Directory as IO import GHC.Toolchain as Toolchain import GHC.Toolchain.Program as Toolchain import Hadrian.Oracles.Path +import Hadrian.Oracles.TextFile (getHostTarget, getTargetTarget) checkPprProgPath, checkPprSourcePath :: FilePath checkPprProgPath = "test/bin/check-ppr" <.> exe @@ -159,8 +160,14 @@ testRules = do depsPkgs <- mod_pkgs . packageDependencies <$> readPackageData progPkg bindir <- getBinaryDirectory testGhc test_args <- outOfTreeCompilerArgs + ht <- getHostTarget + tt <- getTargetTarget + targetPlatform <- setting TargetPlatformFull + let mkGhcProg prog + | targetPlatformTriple ht == targetPlatformTriple tt = targetPlatform ++ "-" ++ prog + | otherwise = prog let dynPrograms = hasDynamic test_args - cmd [bindir </> "ghc" <.> exe] $ + cmd [bindir </> mkGhcProg "ghc" <.> exe] $ -- FIXME: needs proper prefix! concatMap (\p -> ["-package", pkgName p]) depsPkgs ++ ["-o", top -/- path, top -/- sourcePath] ++ mextra ++ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a80b12b5831c495b53cf3057d32061b3... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a80b12b5831c495b53cf3057d32061b3... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help