[commit: ghc] wip/nfs-locking: Add iosHost function. (e7fc568)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7fc5681234fb897f2014194c81b64450811c543/ghc

>---------------------------------------------------------------

commit e7fc5681234fb897f2014194c81b64450811c543
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 9 14:33:51 2016 +0000

    Add iosHost function.
    
    See #138. [skip ci]


>---------------------------------------------------------------

e7fc5681234fb897f2014194c81b64450811c543
 src/Oracles/Config/Setting.hs | 11 +++++++----
 src/Settings/Packages.hs      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Oracles/Config/Setting.hs b/src/Oracles/Config/Setting.hs
index 58f508b..0047f03 100644
--- a/src/Oracles/Config/Setting.hs
+++ b/src/Oracles/Config/Setting.hs
@@ -1,9 +1,9 @@
 module Oracles.Config.Setting (
     Setting (..), SettingList (..),
     setting, settingList, getSetting, getSettingList,
-    anyTargetPlatform, anyTargetOs, anyTargetArch, anyHostOs, windowsHost,
+    anyTargetPlatform, anyTargetOs, anyTargetArch, anyHostOs,
     ghcWithInterpreter, ghcEnableTablesNextToCode, useLibFFIForAdjustors,
-    ghcCanonVersion, cmdLineLengthLimit, osxHost
+    ghcCanonVersion, cmdLineLengthLimit, iosHost, osxHost, windowsHost
     ) where
 
 import Control.Monad.Trans.Reader
@@ -122,12 +122,15 @@ anyTargetArch = matchSetting TargetArch
 anyHostOs :: [String] -> Action Bool
 anyHostOs = matchSetting HostOs
 
-windowsHost :: Action Bool
-windowsHost = anyHostOs ["mingw32", "cygwin32"]
+iosHost :: Action Bool
+iosHost = anyHostOs ["ios"]
 
 osxHost :: Action Bool
 osxHost = anyHostOs ["darwin"]
 
+windowsHost :: Action Bool
+windowsHost = anyHostOs ["mingw32", "cygwin32"]
+
 ghcWithInterpreter :: Action Bool
 ghcWithInterpreter = do
     goodOs <- anyTargetOs [ "mingw32", "cygwin32", "linux", "solaris2"
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 3f4f661..4d2f76c 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -26,7 +26,7 @@ packagesStage0 = mconcat
     -- the stage0 predicate makes sure these packages are built only in Stage0
     , stage0 ? append [deriveConstants, dllSplit, genapply, genprimopcode, hp2ps]
     , stage0 ? windowsHost ? append [touchy]
-    , notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ]
+    , notM windowsHost ? iosHost ? append [terminfo] ]
 
 packagesStage1 :: Packages
 packagesStage1 = mconcat