summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-10-18 12:52:36 +0100
committerCheng Shao <astrohavoc@gmail.com>2022-11-05 14:18:10 +0000
commite41b2f55304bdf3bfb2b67c8e4db06e532cd63fc (patch)
treeb9a281dd320423889fac7ea49c0f3192fe9753e9
parent3c0e379322965aa87b14923f6d8e1ef5cd677925 (diff)
downloadhaskell-e41b2f55304bdf3bfb2b67c8e4db06e532cd63fc.tar.gz
Bump unix submodule to 2.8.0.0
Also bumps process and ghc-boot bounds on unix. For hadrian, when cross-compiling, we add -Wwarn=unused-imports -Wwarn=unused-top-binds to validation flavour. Further fixes in unix and/or hsc2hs is needed to make it completely free of warnings; for the time being, this change is needed to unblock other cross-compilation related work.
-rw-r--r--hadrian/src/Flavour.hs8
-rw-r--r--libraries/base/tests/T7773.hs3
-rw-r--r--libraries/ghc-boot/ghc-boot.cabal.in2
m---------libraries/process0
m---------libraries/unix0
5 files changed, 9 insertions, 4 deletions
diff --git a/hadrian/src/Flavour.hs b/hadrian/src/Flavour.hs
index 46a1ef7d23..88ce819147 100644
--- a/hadrian/src/Flavour.hs
+++ b/hadrian/src/Flavour.hs
@@ -33,6 +33,7 @@ import Text.Parsec.Combinator as P
import Text.Parsec.Char as P
import Control.Monad.Except
import UserSettings
+import Oracles.Flag
import Oracles.Setting
@@ -106,8 +107,13 @@ addArgs args' fl = fl { args = args fl <> args' }
-- | Turn on -Werror for packages built with the stage1 compiler.
-- It mimics the CI settings so is useful to turn on when developing.
+
+-- TODO: the -Wwarn flags are added to make validation flavour works
+-- for cross-compiling unix-2.8.0.0. There needs to be further fixes
+-- in unix and/or hsc2hs to make cross-compiling unix completely free
+-- from warnings.
werror :: Flavour -> Flavour
-werror = addArgs (builder Ghc ? notStage0 ? arg "-Werror")
+werror = addArgs (builder Ghc ? notStage0 ? mconcat [arg "-Werror", flag CrossCompiling ? mconcat [arg "-Wwarn=unused-imports", arg "-Wwarn=unused-top-binds"]])
-- | Build C and Haskell objects with debugging information.
enableDebugInfo :: Flavour -> Flavour
diff --git a/libraries/base/tests/T7773.hs b/libraries/base/tests/T7773.hs
index 13ec40dadf..17502c4b31 100644
--- a/libraries/base/tests/T7773.hs
+++ b/libraries/base/tests/T7773.hs
@@ -3,7 +3,6 @@ import System.Posix.IO
main = do
putStrLn "hello"
- fd <- openFd "/dev/random" ReadOnly Nothing defaultFileFlags
+ fd <- openFd "/dev/random" ReadOnly defaultFileFlags
threadWaitRead fd
putStrLn "goodbye"
-
diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in
index 59ed7ae317..4a35fbf682 100644
--- a/libraries/ghc-boot/ghc-boot.cabal.in
+++ b/libraries/ghc-boot/ghc-boot.cabal.in
@@ -80,4 +80,4 @@ Library
ghc-boot-th == @ProjectVersionMunged@
if !os(windows)
build-depends:
- unix >= 2.7 && < 2.8
+ unix >= 2.7 && < 2.9
diff --git a/libraries/process b/libraries/process
-Subproject 2ac3ff366631a36d84101000045abbefa4415b1
+Subproject cb89d5079d29c38683bcb6feec7dc53ad3836ed
diff --git a/libraries/unix b/libraries/unix
-Subproject 2a6079a2b76adf29d3e3ff213dffe66cabcb76c
+Subproject 3be0223cee7395410915a127eba3acae5ff0b2f