diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2019-08-04 21:14:45 +0200 |
|---|---|---|
| committer | Daniel Gröber (dxld) <dxld@darkboxed.org> | 2019-09-17 17:48:26 +0200 |
| commit | 23864c59abfc6dad5a6b137941d618903817e1e3 (patch) | |
| tree | 7a7394017e8ec0595acb8bb0a5ec3201b8bbaf47 /src/CabalHelper/Compiletime/Program/CabalInstall.hs | |
| parent | a93ed8c7d93df1860d2e56b400b724ac47edf470 (diff) | |
Allow passing override-env to process functions
Unfortunately we need this to pass a custom GHC executable path to stack,
since it doesn't have an option to override it on the commandline (yet?).
Diffstat (limited to 'src/CabalHelper/Compiletime/Program/CabalInstall.hs')
| -rw-r--r-- | src/CabalHelper/Compiletime/Program/CabalInstall.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CabalHelper/Compiletime/Program/CabalInstall.hs b/src/CabalHelper/Compiletime/Program/CabalInstall.hs index 2af1cdc..7276d81 100644 --- a/src/CabalHelper/Compiletime/Program/CabalInstall.hs +++ b/src/CabalHelper/Compiletime/Program/CabalInstall.hs @@ -130,7 +130,7 @@ callCabalInstall , [ "--only-dependencies" ] ] - callProcessStderr (Just "/") (cabalProgram ?progs) cabal_opts + callProcessStderr (Just "/") [] (cabalProgram ?progs) cabal_opts runSetupHs ghcVer db srcdir unpackedCabalVer civ @@ -146,11 +146,11 @@ runSetupHs -> IO () runSetupHs ghcVer db srcdir cabalVer CabalInstallVersion {..} | cabalInstallVer >= parseVer "1.24" = do - go $ \args -> callProcessStderr (Just srcdir) (cabalProgram ?progs) $ + go $ \args -> callProcessStderr (Just srcdir) [] (cabalProgram ?progs) $ [ "act-as-setup", "--" ] ++ args | otherwise = do SetupProgram {..} <- compileSetupHs ghcVer db srcdir - go $ callProcessStderr (Just srcdir) setupProgram + go $ callProcessStderr (Just srcdir) [] setupProgram where parmake_opt :: Maybe Int -> [String] parmake_opt nproc' @@ -180,7 +180,7 @@ compileSetupHs (GhcVersion ghcVer) db srcdir = do file = srcdir </> "Setup" - callProcessStderr (Just srcdir) (ghcProgram ?progs) $ concat + callProcessStderr (Just srcdir) [] (ghcProgram ?progs) $ concat [ [ "--make" , "-package-conf", db ] @@ -232,7 +232,7 @@ installCabalLibV2 _ghcVer cv (PackageEnvFile env_file) = do | ?verbose 4 -> ["-v3"] | otherwise -> [] ] - callProcessStderr (Just cwd) (cabalProgram ?progs) cabal_opts + callProcessStderr (Just cwd) [] (cabalProgram ?progs) cabal_opts hPutStrLn stderr "done" |