diff options
| -rw-r--r-- | hadrian/src/Context.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Hadrian/Builder/Ar.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Hadrian/Utilities.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Oracles/Setting.hs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/src/Context.hs b/hadrian/src/Context.hs index c7d321eba9..6c2c5bd899 100644 --- a/hadrian/src/Context.hs +++ b/hadrian/src/Context.hs @@ -44,7 +44,7 @@ getWay = way <$> getContext getStagedSettingList :: (Stage -> SettingList) -> Args Context b getStagedSettingList f = getSettingList . f =<< getStage --- | Path to the directory containg the final artifact in a given 'Context'. +-- | Path to the directory containing the final artifact in a given 'Context'. libPath :: Context -> Action FilePath libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib")) diff --git a/hadrian/src/Hadrian/Builder/Ar.hs b/hadrian/src/Hadrian/Builder/Ar.hs index ad74653db0..7086f6d48c 100644 --- a/hadrian/src/Hadrian/Builder/Ar.hs +++ b/hadrian/src/Hadrian/Builder/Ar.hs @@ -38,7 +38,7 @@ args :: (ShakeValue c, ShakeValue b) => ArMode -> Args c b args Pack = mconcat [ arg "q", arg =<< getOutput, getInputs ] args Unpack = mconcat [ arg "x", arg =<< getInput ] --- This count includes "q" and the output file argumentes in 'args'. This is +-- This count includes "q" and the output file arguments in 'args'. This is -- only relevant for the 'Pack' @ar@ mode. arFlagsCount :: Int arFlagsCount = 2 diff --git a/hadrian/src/Hadrian/Utilities.hs b/hadrian/src/Hadrian/Utilities.hs index a7d8bacc15..e2fb221940 100644 --- a/hadrian/src/Hadrian/Utilities.hs +++ b/hadrian/src/Hadrian/Utilities.hs @@ -443,7 +443,7 @@ newtype BuildProgressColour = BuildProgressColour String -- | By default, Hadrian tries to figure out if the current terminal -- supports colors using this function. The default can be overridden --- by suppling @--[no-]color@. +-- by supplying @--[no-]color@. shouldUseColor :: IO Bool shouldUseColor = (&&) <$> IO.hIsTerminalDevice IO.stdout diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index 775786b43a..72f67941ae 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -321,7 +321,7 @@ ghcVersionStage _ = setting ProjectVersion -- | The file suffix used for libraries of a given build 'Way'. For example, -- @_p.a@ corresponds to a static profiled library, and @-ghc7.11.20141222.so@ --- is a dynamic vanilly library. Why do we need GHC version number in the +-- is a dynamic vanilla library. Why do we need GHC version number in the -- dynamic suffix? Here is a possible reason: dynamic libraries are placed in a -- single giant directory in the load path of the dynamic linker, and hence we -- must distinguish different versions of GHC. In contrast, static libraries |