summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-08-29 18:42:26 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-09-01 22:44:45 -0400
commit9acba78004d4d4a149b9e1480d1d8c44b7a27cec (patch)
tree3bea723ccd1cccf43f9fcce550addb3c2c36da14 /hadrian
parentcfab4abeaffa8b6a78a19bbfa485169a9c772741 (diff)
downloadhaskell-9acba78004d4d4a149b9e1480d1d8c44b7a27cec.tar.gz
Use C99 Fixed width types to avoid hack in base's configure
Define MD5Context in terms of `uint*_t` and don't use `HsFFI.h`.
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/src/Settings/Builders/Cabal.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/Cabal.hs b/hadrian/src/Settings/Builders/Cabal.hs
index bf6322f14f..96f67b4abf 100644
--- a/hadrian/src/Settings/Builders/Cabal.hs
+++ b/hadrian/src/Settings/Builders/Cabal.hs
@@ -109,7 +109,8 @@ configureArgs = do
, getStagedSettingList ConfCcArgs
, arg $ "-I" ++ top -/- root -/- generatedDir
-- See https://github.com/snowleopard/hadrian/issues/523
- , arg $ "-I" ++ top -/- pkgPath pkg
+ , arg $ "-iquote"
+ , arg $ top -/- pkgPath pkg
, arg $ "-I" ++ top -/- "includes" ]
ldFlags = ldArgs <> (getStagedSettingList ConfGccLinkerArgs)
cppFlags = cppArgs <> (getStagedSettingList ConfCppArgs)