Cabal fix for ghc-options -fplugin in ghc >=9.6.3

Include haskell/cabal#9384 to fix #2096
input-output-hk · Nov 6, 2023 · a0f7e8c · a0f7e8c
1 parent df609c2
commit a0f7e8c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 0 deletions.
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -240,6 +240,7 @@ in {
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.1"  "9.6.3"  ./patches/ghc/ghc-9.6-JS-implement-TH-support.patch)
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isGhcjs) (fromUntil "9.6.3"  "9.8"    ./patches/ghc/ghc-9.6.3-JS-implement-TH-support.patch)
                 ++ fromUntil "9.8.1"  "9.8.2"  ./patches/ghc/ghc-9.8-cabal-c-soures-fix.patch
+                ++ fromUntil "9.6.3"  "9.10"   ./patches/ghc/ghc-9.6.3-Cabal-9384.patch
 
                 # the following is a partial reversal of https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4391, to address haskell.nix#1227
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/mmap-next.patch

diff --git a/overlays/patches/ghc/ghc-9.6.3-Cabal-9384.patch b/overlays/patches/ghc/ghc-9.6.3-Cabal-9384.patch
@@ -0,0 +1,48 @@
+diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs
+index 9d653f858..1fbd15318 100644
+--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs
++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs
+@@ -1861,18 +1861,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
+       libBi = libBuildInfo lib
+       comp        = compiler lbi
+       platform    = hostPlatform lbi
+-      vanillaArgs0 =
++      vanillaArgs =
+         (componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi))
+         `mappend` mempty {
+           ghcOptMode         = toFlag GhcModeAbiHash,
+           ghcOptInputModules = toNubListR $ exposedModules lib
+         }
+-      vanillaArgs =
+-          -- Package DBs unnecessary, and break ghc-cabal. See #3633
+-          -- BUT, put at least the global database so that 7.4 doesn't
+-          -- break.
+-          vanillaArgs0 { ghcOptPackageDBs = [GlobalPackageDB]
+-                       , ghcOptPackages = mempty }
+       sharedArgs = vanillaArgs `mappend` mempty {
+                        ghcOptDynLinkMode = toFlag GhcDynamicOnly,
+                        ghcOptFPic        = toFlag True,
+diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs
+index c8721746a..dcd5b3230 100644
+--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs
++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs
+@@ -1573,18 +1573,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
+       libBi = libBuildInfo lib
+       comp        = compiler lbi
+       platform    = hostPlatform lbi
+-      vanillaArgs0 =
++      vanillaArgs =
+         (componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi))
+         `mappend` mempty {
+           ghcOptMode         = toFlag GhcModeAbiHash,
+           ghcOptInputModules = toNubListR $ exposedModules lib
+         }
+-      vanillaArgs =
+-          -- Package DBs unnecessary, and break ghc-cabal. See #3633
+-          -- BUT, put at least the global database so that 7.4 doesn't
+-          -- break.
+-          vanillaArgs0 { ghcOptPackageDBs = [GlobalPackageDB]
+-                       , ghcOptPackages = mempty }
+       sharedArgs = vanillaArgs `mappend` mempty {
+                        ghcOptDynLinkMode = toFlag GhcDynamicOnly,
+                        ghcOptFPic        = toFlag True,