|
| 1 | +diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs |
| 2 | +index 9d653f858..1fbd15318 100644 |
| 3 | +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs |
| 4 | ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs |
| 5 | +@@ -1861,18 +1861,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do |
| 6 | + libBi = libBuildInfo lib |
| 7 | + comp = compiler lbi |
| 8 | + platform = hostPlatform lbi |
| 9 | +- vanillaArgs0 = |
| 10 | ++ vanillaArgs = |
| 11 | + (componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi)) |
| 12 | + `mappend` mempty { |
| 13 | + ghcOptMode = toFlag GhcModeAbiHash, |
| 14 | + ghcOptInputModules = toNubListR $ exposedModules lib |
| 15 | + } |
| 16 | +- vanillaArgs = |
| 17 | +- -- Package DBs unnecessary, and break ghc-cabal. See #3633 |
| 18 | +- -- BUT, put at least the global database so that 7.4 doesn't |
| 19 | +- -- break. |
| 20 | +- vanillaArgs0 { ghcOptPackageDBs = [GlobalPackageDB] |
| 21 | +- , ghcOptPackages = mempty } |
| 22 | + sharedArgs = vanillaArgs `mappend` mempty { |
| 23 | + ghcOptDynLinkMode = toFlag GhcDynamicOnly, |
| 24 | + ghcOptFPic = toFlag True, |
| 25 | +diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs |
| 26 | +index c8721746a..dcd5b3230 100644 |
| 27 | +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs |
| 28 | ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHCJS.hs |
| 29 | +@@ -1573,18 +1573,12 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do |
| 30 | + libBi = libBuildInfo lib |
| 31 | + comp = compiler lbi |
| 32 | + platform = hostPlatform lbi |
| 33 | +- vanillaArgs0 = |
| 34 | ++ vanillaArgs = |
| 35 | + (componentGhcOptions verbosity lbi libBi clbi (componentBuildDir lbi clbi)) |
| 36 | + `mappend` mempty { |
| 37 | + ghcOptMode = toFlag GhcModeAbiHash, |
| 38 | + ghcOptInputModules = toNubListR $ exposedModules lib |
| 39 | + } |
| 40 | +- vanillaArgs = |
| 41 | +- -- Package DBs unnecessary, and break ghc-cabal. See #3633 |
| 42 | +- -- BUT, put at least the global database so that 7.4 doesn't |
| 43 | +- -- break. |
| 44 | +- vanillaArgs0 { ghcOptPackageDBs = [GlobalPackageDB] |
| 45 | +- , ghcOptPackages = mempty } |
| 46 | + sharedArgs = vanillaArgs `mappend` mempty { |
| 47 | + ghcOptDynLinkMode = toFlag GhcDynamicOnly, |
| 48 | + ghcOptFPic = toFlag True, |
0 commit comments