Merge pull request #7352 from matthewbauer/turn-off-prepositive-quali…

…fied-module Set -Wno-prepositive-qualified-module in Paths_*.hs
haskell · May 4, 2021 · 4f8aeb2 · 4f8aeb2
2 parents 174673d + de378ca
commit 4f8aeb2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/Cabal/src/Distribution/Simple/Build/PathsModule.hs b/Cabal/src/Distribution/Simple/Build/PathsModule.hs
@@ -41,7 +41,6 @@ generatePathsModule pkg_descr lbi clbi = Z.render Z.Z
     , Z.zVersionDigits              = show $ versionNumbers $ packageVersion pkg_descr
     , Z.zSupportsCpp                = supports_cpp
     , Z.zSupportsNoRebindableSyntax = supports_rebindable_syntax
-    , Z.zSupportsNoMissingSafeHaskellMode = supports_missing_safehaskell
     , Z.zAbsolute                   = absolute
     , Z.zRelocatable                = relocatable lbi
     , Z.zIsWindows                  = isWindows
@@ -62,7 +61,6 @@ generatePathsModule pkg_descr lbi clbi = Z.render Z.Z
     supports_cpp                 = supports_language_pragma
     supports_rebindable_syntax   = ghc_newer_than (mkVersion [7,0,1])
     supports_language_pragma     = ghc_newer_than (mkVersion [6,6,1])
-    supports_missing_safehaskell = ghc_newer_than (mkVersion [8,10,1])
 
     ghc_newer_than minVersion =
         case compilerCompatVersion GHC (compiler lbi) of

diff --git a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
@@ -6,7 +6,6 @@ data Z
          zVersionDigits :: String,
          zSupportsCpp :: Bool,
          zSupportsNoRebindableSyntax :: Bool,
-         zSupportsNoMissingSafeHaskellMode :: Bool,
          zAbsolute :: Bool,
          zRelocatable :: Bool,
          zIsWindows :: Bool,
@@ -43,12 +42,7 @@ render z_root = execWriter $ do
   else do
     return ()
   tell "{-# OPTIONS_GHC -fno-warn-missing-import-lists #-}\n"
-  if (zSupportsNoMissingSafeHaskellMode z_root)
-  then do
-    tell "{-# OPTIONS_GHC -Wno-missing-safe-haskell-mode #-}\n"
-    return ()
-  else do
-    return ()
+  tell "{-# OPTIONS_GHC -w #-}\n"
   tell "module Paths_"
   tell (zManglePkgName z_root (zPackageName z_root))
   tell " (\n"

diff --git a/cabal-dev-scripts/src/GenPathsModule.hs b/cabal-dev-scripts/src/GenPathsModule.hs
@@ -27,7 +27,6 @@ $(capture "decls" [d|
         , zVersionDigits              :: String
         , zSupportsCpp                :: Bool
         , zSupportsNoRebindableSyntax :: Bool
-        , zSupportsNoMissingSafeHaskellMode :: Bool
         , zAbsolute                   :: Bool
         , zRelocatable                :: Bool
         , zIsWindows                  :: Bool

diff --git a/templates/Paths_pkg.template.hs b/templates/Paths_pkg.template.hs
@@ -8,9 +8,7 @@
 {-# LANGUAGE ForeignFunctionInterface #-}
 {% endif %}
 {-# OPTIONS_GHC -fno-warn-missing-import-lists #-}
-{% if supportsNoMissingSafeHaskellMode %}
-{-# OPTIONS_GHC -Wno-missing-safe-haskell-mode #-}
-{% endif %}
+{-# OPTIONS_GHC -w #-}
 module Paths_{{ manglePkgName packageName }} (
     version,
     getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,