aboutsummaryrefslogtreecommitdiff
path: root/src/CabalHelper/Compiletime
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-01-30 20:58:02 +0100
committerDaniel Gröber <dxld@darkboxed.org>2019-01-30 20:58:02 +0100
commit74704110ca0eb6760a6e133ac88133a590d4ef8f (patch)
tree3ca5c6d4eb185d342bd6ffe6d7b6f9b7ff50a5f5 /src/CabalHelper/Compiletime
parent2613f676d0c6d16a92eaae00eb4cccad9504998e (diff)
Fix ghc-pkg guessing logic when using v2-install
Diffstat (limited to 'src/CabalHelper/Compiletime')
-rw-r--r--src/CabalHelper/Compiletime/Program/CabalInstall.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CabalHelper/Compiletime/Program/CabalInstall.hs b/src/CabalHelper/Compiletime/Program/CabalInstall.hs
index 6b6d401..3f87215 100644
--- a/src/CabalHelper/Compiletime/Program/CabalInstall.hs
+++ b/src/CabalHelper/Compiletime/Program/CabalInstall.hs
@@ -228,7 +228,7 @@ cabalV2WithGHCProgOpts :: Progs => [String]
cabalV2WithGHCProgOpts = concat
[ [ "--with-compiler=" ++ ghcProgram ?cprogs ]
, if ghcPkgProgram ?cprogs /= ghcPkgProgram defaultCompPrograms
- then error "cabalV2WithGHCProgOpts: ghc-pkg path was changed from default but cabal v2-install does not support passing --with-ghc-pkg!"
+ then [ "--with-hc-pkg=" ++ ghcPkgProgram ?cprogs ]
else []
]