From 09e2236679739547984e2e29db23e160a3a80890 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Mon, 29 Jan 2018 18:22:04 +0200 Subject: Revert hsSourceDirs hackery (#43) Move hack to GhcSession test for now, the corresponding logic should be moved into c-h instead of living in ghc-mod instead. --- tests/GhcSession.hs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs index a1c164f..4845565 100644 --- a/tests/GhcSession.hs +++ b/tests/GhcSession.hs @@ -144,8 +144,20 @@ compileModule nb ep opts = do ts <- mapM (\t -> guessTarget t Nothing) $ case ep of ChLibEntrypoint ms ms' ss -> map unChModuleName $ ms ++ ms' ++ ss - ChExeEntrypoint m ms -> [m] ++ map unChModuleName ms + ChExeEntrypoint m' ms -> + let + + -- The options first clear out includes, then put in the build dir. We want the + -- first one after that, so "regex-example" in the following case + -- + -- ,"-i" + -- ,"-idist/build/regex-example" + -- ,"-iregex-example" + firstInclude = drop 2 $ head $ drop 2 $ filter (isPrefixOf "-i") opts + m = firstInclude m' + in [m] ++ map unChModuleName ms ChSetupEntrypoint -> ["Setup.hs"] + let ts' = case nb of NoBuildOutput -> map (\t -> t { targetAllowObjCode = False }) ts ProduceBuildOutput -> ts -- cgit v1.2.3