diff options
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/doc/flavours.md | 2 | ||||
| -rw-r--r-- | hadrian/hadrian.cabal | 2 | ||||
| -rw-r--r-- | hadrian/src/Context.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Hadrian/Builder.hs | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/hadrian/doc/flavours.md b/hadrian/doc/flavours.md index 6c05bd1478..61af4f4075 100644 --- a/hadrian/doc/flavours.md +++ b/hadrian/doc/flavours.md @@ -132,7 +132,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <td>-O</td> </tr> <tr> - <th>validate</td> + <th>slow-validate</td> <td>-O0<br>-H64m</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index 013896e887..8e8793fb1b 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -14,7 +14,7 @@ source-repository head type: git location: https://gitlab.haskell.org/ghc/ghc --- To accomodate #16873 +-- To accommodate #16873 flag threaded manual: True default: True diff --git a/hadrian/src/Context.hs b/hadrian/src/Context.hs index 0676743ee5..6e1d84de4b 100644 --- a/hadrian/src/Context.hs +++ b/hadrian/src/Context.hs @@ -51,7 +51,7 @@ libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib")) -- | Get the directory name for binary distribution files -- @<arch>-<os>-ghc-<version>@. -- --- We preform some renaming to accomodate Cabal's slightly different naming +-- We preform some renaming to accommodate Cabal's slightly different naming -- conventions (see 'cabalOsString' and 'cabalArchString'). distDir :: Stage -> Action FilePath distDir st = do diff --git a/hadrian/src/Hadrian/Builder.hs b/hadrian/src/Hadrian/Builder.hs index 5d645eea8c..fdfdb666ef 100644 --- a/hadrian/src/Hadrian/Builder.hs +++ b/hadrian/src/Hadrian/Builder.hs @@ -35,7 +35,7 @@ data BuildInfo = BuildInfo { buildOutputs :: [FilePath], -- | Options to be passed to Shake's 'cmd' function. buildOptions :: [CmdOption], - -- | Resources to be aquired. + -- | Resources to be acquired. buildResources :: [(Resource, Int)] } class ShakeValue b => Builder b where @@ -48,7 +48,7 @@ class ShakeValue b => Builder b where askBuilderWith :: b -> BuildInfo -> Action String -- | Runtime dependencies of a builder. For example, on Windows GHC requires - -- the utility @touchy.exe@ to be avilable on a specific path. + -- the utility @touchy.exe@ to be available on a specific path. runtimeDependencies :: b -> Action [FilePath] runtimeDependencies _ = return [] |