From cec921f15cb8c326fe81f6e32aebec1516ca36e6 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Wed, 21 Aug 2019 00:08:54 +0200
Subject: Implement cabal v2 backpack unit workaround

See https://github.com/haskell/cabal/issues/6201 for details about the bug
---
 tests/GhcSession.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs
index 9fc7899..45fe82e 100644
--- a/tests/GhcSession.hs
+++ b/tests/GhcSession.hs
@@ -321,12 +321,11 @@ test modProgs (psdImpl -> ProjSetupImpl{..}) topdir tmpdir projdir cabal_file
 
     psiSdist progs topdir tmpdir
 
+    cs <- concat <$> runQuery (allUnits (Map.elems . uiComponents)) qe
+
     -- TODO: Cludge until we can just build the unit dependencies
-    -- TODO: Move back under runQuery when we fixed backpack
     runQuery buildProject qe
 
-    cs <- concat <$> runQuery (allUnits (Map.elems . uiComponents)) qe
-
     let pkgdir = takeDirectory cabal_file
     homedir <- getHomeDirectory
     let var_table =
-- 
cgit v1.2.3