From 0e0d313d9962ed0680e40d0e070d7bf9f965d1ae Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Sun, 8 Oct 2017 13:54:18 +0100 Subject: [PATCH] Haddock: support splitted include paths. --- haddock-api/src/Haddock/GhcUtils.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 4963d2f864..2eb143b45d 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -28,6 +28,7 @@ import Module import HscTypes import GHC import Class +import DynFlags moduleString :: Module -> String @@ -282,7 +283,8 @@ minimalDef n = do setObjectDir, setHiDir, setStubDir, setOutputDir :: String -> DynFlags -> DynFlags setObjectDir f d = d{ objectDir = Just f} setHiDir f d = d{ hiDir = Just f} -setStubDir f d = d{ stubDir = Just f, includePaths = f : includePaths d } +setStubDir f d = d{ stubDir = Just f + , includePaths = addGlobalInclude (includePaths d) [f] } -- -stubdir D adds an implicit -I D, so that gcc can find the _stub.h file -- \#included from the .hc file when compiling with -fvia-C. setOutputDir f = setObjectDir f . setHiDir f . setStubDir f