From ac027c3edc58680199aff1253efbacaa5eefd3d6 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Mon, 1 Apr 2019 21:10:03 +0200
Subject: Fix getHelper ignoring withProgs environment

---
 lib/Distribution/Helper.hs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'lib/Distribution/Helper.hs')

diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs
index 38f819f..6e97d53 100644
--- a/lib/Distribution/Helper.hs
+++ b/lib/Distribution/Helper.hs
@@ -656,11 +656,8 @@ getHelper ProjInfo{piCabalVersion} QueryEnv{..}
         helper_main $ cabal_file : distdir : args
 getHelper proj_info qe@QueryEnv{..} = do
   withVerbosity $ withProgs (piImpl proj_info) qe $ do
-    let comp = mkCompHelperEnv qeProjLoc qeDistDir proj_info
-    let ?progs = qePrograms
-        ?cprogs = qeCompPrograms
     t0 <- Clock.getTime Monotonic
-    eexe <- compileHelper comp
+    eexe <- compileHelper $ mkCompHelperEnv qeProjLoc qeDistDir proj_info
     t1 <- Clock.getTime Monotonic
     let dt = (/10e9) $ fromInteger $ Clock.toNanoSecs $ Clock.diffTimeSpec t0 t1
         dt :: Float
-- 
cgit v1.2.3