[commit: ghc] master: Add -I$1/$2/build/autogen to $1_$2_DIST_CC_OPTS (030ece4)
git at git.haskell.org
git at git.haskell.org
Sun Dec 7 15:57:52 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/030ece4ee0ef22f85a7b105b86dc102408a0df0f/ghc
>---------------------------------------------------------------
commit 030ece4ee0ef22f85a7b105b86dc102408a0df0f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sun Dec 7 16:55:26 2014 +0100
Add -I$1/$2/build/autogen to $1_$2_DIST_CC_OPTS
This is closer to how `cabal` behaves and is required for cbits to
be able to `#include "cabal_macros.h"`
>---------------------------------------------------------------
030ece4ee0ef22f85a7b105b86dc102408a0df0f
rules/distdir-opts.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk
index a252ce7..3126a88 100644
--- a/rules/distdir-opts.mk
+++ b/rules/distdir-opts.mk
@@ -51,6 +51,7 @@ $1_$2_DIST_GCC_CC_OPTS = \
$1_$2_DIST_CC_OPTS = \
$$(SRC_CC_OPTS) \
$$($1_CC_OPTS) \
+ -I$1/$2/build/autogen \
$$(foreach dir,$$(filter-out /%,$$($1_$2_INCLUDE_DIRS)),-I$1/$$(dir)) \
$$(foreach dir,$$(filter /%,$$($1_$2_INCLUDE_DIRS)),-I$$(dir)) \
$$($1_$2_CC_OPTS) \
More information about the ghc-commits
mailing list