Allow overriding path and setting options for Cabal PROGs

Closes commercialhaskell#2369.
kgadek · May 7, 2017 · 3c841e8 · 3c841e8
1 parent ea10057
commit 3c841e8
Show file tree

Hide file tree

Showing 6 changed files with 791 additions and 18 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -49,6 +49,8 @@ Other enhancements:
   a method to ensure PVP compliance without having to proactively fix
   bounds issues for Stackage maintenance.
 * Expose a `save-hackage-creds` configuration option
+* Add the ability to explictly specify path and options to executables.
+  See [#2369](https://github.com/commercialhaskell/stack/issues/2369).
 
 Bug fixes:
 

diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md
@@ -392,12 +392,14 @@ extra-lib-dirs:
 - /opt/foo/lib
 ```
 
-### with-gcc
+### with-gcc/with-ld/with-strip
 
-Specify a path to gcc explicitly, rather than relying on the normal path resolution.
+Specify a path to gcc, ld, or strip explicitly, rather than relying on the normal path resolution.
 
 ```yaml
 with-gcc: /usr/local/bin/gcc-5
+with-ld: /usr/local/bin/ld
+with-strip: /usr/local/bin/gstrip
 ```
 
 ### compiler-check

diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -298,7 +298,58 @@ configFromConfigMonoid
 
          configExtraIncludeDirs = configMonoidExtraIncludeDirs
          configExtraLibDirs = configMonoidExtraLibDirs
-         configOverrideGccPath = getFirst configMonoidOverrideGccPath
+         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.