Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC Commits: 66254fae by mangoiv at 2026-08-26T16:58:54+02:00 fixup! ci: build and test stage - - - - - 3 changed files: - hadrian/src/Base.hs - hadrian/src/Builder.hs - hadrian/src/Hadrian/Package.hs Changes: ===================================== hadrian/src/Base.hs ===================================== @@ -22,6 +22,7 @@ module Base ( module Development.Shake.Util, Vec(..), (&%>), + exe, -- * Basic data types module Hadrian.Package, @@ -56,8 +57,9 @@ import Development.Shake hiding (unit, (&%>), Normal) import Development.Shake hiding (unit, (&%>), (*>), Normal) #endif import qualified Development.Shake as Shake +import qualified Development.Shake.FilePath as Shake import Development.Shake.Classes -import Development.Shake.FilePath +import Development.Shake.FilePath hiding (exe) import Development.Shake.Util import Hadrian.Oracles.DirectoryContents import Hadrian.Utilities @@ -68,6 +70,18 @@ import GHC.Stack ( HasCallStack ) import Stage import Way +isWasm :: Bool +isWasm = +#if defined(wasm32_HOST_ARCH) + True +#else + False +#endif + +exe :: FilePath +exe | isWasm = "wasm" + | otherwise = Shake.exe + -- | Hadrian lives in the 'hadrianPath' directory of the GHC tree. hadrianPath :: FilePath hadrianPath = "hadrian" ===================================== hadrian/src/Builder.hs ===================================== @@ -15,7 +15,6 @@ import Control.Exception.Extra (Partial) import qualified Data.ByteString.Lazy.Char8 as BSL import Development.Shake.Classes import Development.Shake.Command -import Development.Shake.FilePath import GHC.Generics import GHC.Platform.ArchOS (ArchOS(..), Arch(..), OS(..)) import qualified Hadrian.Builder as H ===================================== hadrian/src/Hadrian/Package.hs ===================================== @@ -23,7 +23,7 @@ module Hadrian.Package ( ) where import Development.Shake.Classes -import Development.Shake.FilePath +import Development.Shake.FilePath ((<.>)) import GHC.Generics import Hadrian.Utilities View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66254fae94590a7c9d45e88fb42423e5... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/66254fae94590a7c9d45e88fb42423e5... 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