From 359626cd1679c2eca41697a0d81209c4c3a93752 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Mon, 8 Dec 2025 16:47:20 +0700 Subject: [PATCH 1/4] Update Z.hs --- Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs index 8f33717bbda..283b05763cb 100644 --- a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs +++ b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs @@ -51,7 +51,6 @@ render z_root = execWriter $ do return () else do return () - tell "{-# OPTIONS_GHC -Wno-missing-import-lists #-}\n" tell "{-# OPTIONS_GHC -w #-}\n" tell "\n" tell "{-|\n" From dcac91f4a403483fb75f920ed401f840f0f574a6 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Mon, 8 Dec 2025 16:49:58 +0700 Subject: [PATCH 2/4] Update Z.hs --- Cabal/src/Distribution/Simple/Build/PackageInfoModule/Z.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/Cabal/src/Distribution/Simple/Build/PackageInfoModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PackageInfoModule/Z.hs index 19bf632c4d5..6fdbfb176b7 100644 --- a/Cabal/src/Distribution/Simple/Build/PackageInfoModule/Z.hs +++ b/Cabal/src/Distribution/Simple/Build/PackageInfoModule/Z.hs @@ -22,7 +22,6 @@ render z_root = execWriter $ do return () else do return () - tell "{-# OPTIONS_GHC -Wno-missing-import-lists #-}\n" tell "{-# OPTIONS_GHC -w #-}\n" tell "\n" tell "{-|\n" From ce72866714ab56186f858621eaa4def8ee4f5363 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Mon, 8 Dec 2025 16:53:20 +0700 Subject: [PATCH 3/4] Update Paths_pkg.template.hs --- templates/Paths_pkg.template.hs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/templates/Paths_pkg.template.hs b/templates/Paths_pkg.template.hs index a9b02b0ef64..9577070e169 100644 --- a/templates/Paths_pkg.template.hs +++ b/templates/Paths_pkg.template.hs @@ -7,12 +7,6 @@ {% if not absolute %} {-# LANGUAGE ForeignFunctionInterface #-} {% endif %} -{% if supportsCpp %} -#if __GLASGOW_HASKELL__ >= 810 -{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-} -#endif -{% endif %} -{-# OPTIONS_GHC -Wno-missing-import-lists #-} {-# OPTIONS_GHC -w #-} {-| From d807a1fe84adb3119e53a3550963e0db27796c47 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Mon, 8 Dec 2025 17:22:59 +0700 Subject: [PATCH 4/4] Update Z.hs --- Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs index 283b05763cb..d401ce305c4 100644 --- a/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs +++ b/Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs @@ -43,14 +43,6 @@ render z_root = execWriter $ do return () else do return () - if (zSupportsCpp z_root) - then do - tell "#if __GLASGOW_HASKELL__ >= 810\n" - tell "{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}\n" - tell "#endif\n" - return () - else do - return () tell "{-# OPTIONS_GHC -w #-}\n" tell "\n" tell "{-|\n"