Do not filter GHC flags

Author: coot

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -2379,6 +2379,17 @@ elaborateInstallPlan
                     ]
                 )
                 (perPkgOptionMapMappend pkgid packageConfigProgramArgs)
+            elabNormalisedProgramArgs =
+              Map.unionWith
+                (++)
+                ( Map.fromList
+                    [ (programId prog, args)
+                    | prog <- configuredPrograms compilerprogdb
+                    , let args = programOverrideArgs $ addHaddockIfDocumentationEnabled prog
+                    , not (null args)
+                    ]
+                )
+                (perPkgOptionMapMappend pkgid packageConfigProgramArgs)
             elabProgramPathExtra = perPkgOptionNubList pkgid packageConfigProgramPathExtra
             elabConfiguredPrograms = configuredPrograms compilerprogdb
             elabConfigureScriptArgs = perPkgOptionList pkgid packageConfigConfigureArgs
@@ -4513,7 +4524,7 @@ packageHashConfigInputs shared@ElaboratedSharedConfig{..} pkg =
     , pkgHashStripLibs = stripLibs
     , pkgHashStripExes = stripExes
     , pkgHashDebugInfo = withDebugInfo
-    , pkgHashProgramArgs = elabProgramArgs
+    , pkgHashProgramArgs = elabNormalisedProgramArgs
     , pkgHashExtraLibDirs = elabExtraLibDirs
     , pkgHashExtraLibDirsStatic = elabExtraLibDirsStatic
     , pkgHashExtraFrameworkDirs = elabExtraFrameworkDirs

cabal-install/src/Distribution/Client/ProjectPlanning/Types.hs

@@ -274,6 +274,7 @@ data ElaboratedConfiguredPackage = ElaboratedConfiguredPackage
   , elabDumpBuildInfo :: DumpBuildInfo
   , elabProgramPaths :: Map String FilePath
   , elabProgramArgs :: Map String [String]
+  , elabNormalisedProgramArgs :: Map String [String]
   , elabProgramPathExtra :: [FilePath]
   , elabConfiguredPrograms :: [ConfiguredProgram]
   , elabConfigureScriptArgs :: [String]
@@ -345,7 +346,7 @@ normaliseConfiguredPackage
   -> ElaboratedConfiguredPackage
   -> ElaboratedConfiguredPackage
 normaliseConfiguredPackage ElaboratedSharedConfig{pkgConfigCompilerProgs} pkg =
-  pkg{elabProgramArgs = Map.mapMaybeWithKey lookupFilter (elabProgramArgs pkg)}
+  pkg{elabNormalisedProgramArgs = Map.mapMaybeWithKey lookupFilter (elabProgramArgs pkg)}
   where
     knownProgramDb = addKnownPrograms builtinPrograms pkgConfigCompilerProgs
 

cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out

@@ -4,14 +4,14 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - plain-0.1.0.0 *test (first run)
 Configuring plain-0.1.0.0...
-Preprocessing library for plain-0.1.0.0...
-Building library for plain-0.1.0.0...
-Preprocessing test suite 'test' for plain-0.1.0.0...
-Building test suite 'test' for plain-0.1.0.0...
+Preprocessing library for plain-0.1.0.0..
+Building library for plain-0.1.0.0..
+Preprocessing test suite 'test' for plain-0.1.0.0..
+Building test suite 'test' for plain-0.1.0.0..
 Running 1 test suites...
 Test suite test: RUNNING...
 Test suite test: PASS
-Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/test/plain-0.1.0.0-test.log
-Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
+Test suite logged to: cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/test/plain-0.1.0.0-test.log
+Test coverage report written to cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/test/hpc_index.html
 1 of 1 test suites (1 of 1 test cases) passed.
-Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
+Package coverage report written to cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/plain-0.1.0.0/hpc_index.html

cabal-testsuite/PackageTests/Regression/T9640/cabal.out

@@ -8,8 +8,8 @@ In order, the following will be built:
  - one-custom-0.1.0.0 (lib:one-custom) (requires build)
  - depend-on-custom-with-exe-0.1.0.0 (lib) (first run)
 Configuring one-custom-0.1.0.0...
-Preprocessing library for one-custom-0.1.0.0...
-Building library for one-custom-0.1.0.0...
+Preprocessing library for one-custom-0.1.0.0..
+Building library for one-custom-0.1.0.0..
 Installing library in <PATH>
 Warning: depend-on-custom-with-exe.cabal:16:1: Ignoring trailing fields after sections: "ghc-options"
 Configuring library for depend-on-custom-with-exe-0.1.0.0...

changelog.d/pr-11259.md

@@ -0,0 +1,5 @@
+---
+synopsis: Do not filter program arguments (e.g. for ghc, etc)
+packages: [Cabal]
+prs: 11259
+---