Add --with-PROG and --PROG-option for every PROG Cabal uses

This is a more complete solution comparing with d145fcf. Closes commercialhaskell#2369.
kgadek · Apr 16, 2017 · c439e60 · c439e60
1 parent 06c3d44
commit c439e60
Show file tree

Hide file tree

Showing 4 changed files with 781 additions and 46 deletions.
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -298,9 +298,58 @@ configFromConfigMonoid
 
          configExtraIncludeDirs = configMonoidExtraIncludeDirs
          configExtraLibDirs = configMonoidExtraLibDirs
-         configOverrideGccPath = getFirst configMonoidOverrideGccPath
-         configOverrideLdPath = getFirst configMonoidOverrideLdPath
-         configOverrideStripPath = getFirst configMonoidOverrideStripPath
+         configProgAlexPath            = getFirst configMonoidProgAlexPath
+         configProgArPath              = getFirst configMonoidProgArPath
+         configProgC2hsPath            = getFirst configMonoidProgC2hsPath
+         configProgCpphsPath           = getFirst configMonoidProgCpphsPath
+         configProgGccPath             = getFirst configMonoidProgGccPath
+         configProgGhcPath             = getFirst configMonoidProgGhcPath
+         configProgGhcPkgPath          = getFirst configMonoidProgGhcPkgPath
+         configProgGhcjsPath           = getFirst configMonoidProgGhcjsPath
+         configProgGhcjsPkgPath        = getFirst configMonoidProgGhcjsPkgPath
+         configProgGreencardPath       = getFirst configMonoidProgGreencardPath
+         configProgHaddockPath         = getFirst configMonoidProgHaddockPath
+         configProgHappyPath           = getFirst configMonoidProgHappyPath
+         configProgHaskellSuitePath    = getFirst configMonoidProgHaskellSuitePath
+         configProgHaskellSuitePkgPath = getFirst configMonoidProgHaskellSuitePkgPath
+         configProgHmakePath           = getFirst configMonoidProgHmakePath
+         configProgHpcPath             = getFirst configMonoidProgHpcPath
+         configProgHsc2hsPath          = getFirst configMonoidProgHsc2hsPath
+         configProgHscolourPath        = getFirst configMonoidProgHscolourPath
+         configProgJhcPath             = getFirst configMonoidProgJhcPath
+         configProgLdPath              = getFirst configMonoidProgLdPath
+         configProgLhcPath             = getFirst configMonoidProgLhcPath
+         configProgLhcPkgPath          = getFirst configMonoidProgLhcPkgPath
+         configProgPkgConfigPath       = getFirst configMonoidProgPkgConfigPath
+         configProgStripPath           = getFirst configMonoidProgStripPath
+         configProgTarPath             = getFirst configMonoidProgTarPath
+         configProgUhcPath             = getFirst configMonoidProgUhcPath
+         configProgAlexOptions            = configMonoidProgAlexOptions
+         configProgArOptions              = configMonoidProgArOptions
+         configProgC2hsOptions            = configMonoidProgC2hsOptions
+         configProgCpphsOptions           = configMonoidProgCpphsOptions
+         configProgGccOptions             = configMonoidProgGccOptions
+         configProgGhcOptions             = configMonoidProgGhcOptions
+         configProgGhcPkgOptions          = configMonoidProgGhcPkgOptions
+         configProgGhcjsOptions           = configMonoidProgGhcjsOptions
+         configProgGhcjsPkgOptions        = configMonoidProgGhcjsPkgOptions
+         configProgGreencardOptions       = configMonoidProgGreencardOptions
+         configProgHaddockOptions         = configMonoidProgHaddockOptions
+         configProgHappyOptions           = configMonoidProgHappyOptions
+         configProgHaskellSuiteOptions    = configMonoidProgHaskellSuiteOptions
+         configProgHaskellSuitePkgOptions = configMonoidProgHaskellSuitePkgOptions
+         configProgHmakeOptions           = configMonoidProgHmakeOptions
+         configProgHpcOptions             = configMonoidProgHpcOptions
+         configProgHsc2hsOptions          = configMonoidProgHsc2hsOptions
+         configProgHscolourOptions        = configMonoidProgHscolourOptions
+         configProgJhcOptions             = configMonoidProgJhcOptions
+         configProgLdOptions              = configMonoidProgLdOptions
+         configProgLhcOptions             = configMonoidProgLhcOptions
+         configProgLhcPkgOptions          = configMonoidProgLhcPkgOptions
+         configProgPkgConfigOptions       = configMonoidProgPkgConfigOptions
+         configProgStripOptions           = configMonoidProgStripOptions
+         configProgTarOptions             = configMonoidProgTarOptions
+         configProgUhcOptions             = configMonoidProgUhcOptions
 
          -- Only place in the codebase where platform is hard-coded. In theory
          -- in the future, allow it to be configured.