From 74704110ca0eb6760a6e133ac88133a590d4ef8f Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Wed, 30 Jan 2019 20:58:02 +0100 Subject: Fix ghc-pkg guessing logic when using v2-install --- src/CabalHelper/Compiletime/Program/CabalInstall.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/CabalHelper/Compiletime') 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 [] ] -- cgit v1.2.3