From 8ea084d89555aa8931f20a112eac2c7dac79a4c3 Mon Sep 17 00:00:00 2001 From: Andrey Mokhov Date: Tue, 13 Mar 2018 13:06:17 +0000 Subject: [PATCH] Add extra include paths when invoking ghc-cabal See #523 --- src/Settings/Builders/GhcCabal.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Settings/Builders/GhcCabal.hs b/src/Settings/Builders/GhcCabal.hs index bfb84a76ec..78b45870b9 100644 --- a/src/Settings/Builders/GhcCabal.hs +++ b/src/Settings/Builders/GhcCabal.hs @@ -56,13 +56,17 @@ configureArgs :: Args configureArgs = do top <- expr topDirectory root <- getBuildRoot + pkg <- getPackage let conf key expr = do values <- unwords <$> expr not (null values) ? arg ("--configure-option=" ++ key ++ "=" ++ values) cFlags = mconcat [ remove ["-Werror"] cArgs , getStagedSettingList ConfCcArgs - , arg $ "-I" ++ top -/- root -/- generatedDir ] + , arg $ "-I" ++ top -/- root -/- generatedDir + -- See https://github.com/snowleopard/hadrian/issues/523 + , arg $ "-I" ++ top -/- pkgPath pkg + , arg $ "-I" ++ top -/- "includes" ] ldFlags = ldArgs <> (getStagedSettingList ConfGccLinkerArgs) cppFlags = cppArgs <> (getStagedSettingList ConfCppArgs) cldFlags <- unwords <$> (cFlags <> ldFlags)