diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-06-20 09:02:34 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-06-30 20:02:23 +0200 |
| commit | 0701db125eb32ed0a518d962c9e4ee279e3296fd (patch) | |
| tree | ed9102cd788355570475234673106c3afd33f933 /rules/distdir-opts.mk | |
| parent | b8b3e30a6eedf9f213b8a718573c4827cfa230ba (diff) | |
| download | haskell-0701db125eb32ed0a518d962c9e4ee279e3296fd.tar.gz | |
Updates to handle new Cabal
Specifically per-component macros and multiple libraries.
Contains Cabal submodule update.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: austin, bgamari
Reviewed By: austin, bgamari
Subscribers: hvr, thomie
Differential Revision: https://phabricator.haskell.org/D2059
Diffstat (limited to 'rules/distdir-opts.mk')
| -rw-r--r-- | rules/distdir-opts.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk index e411559b59..0d60f99fe6 100644 --- a/rules/distdir-opts.mk +++ b/rules/distdir-opts.mk @@ -35,7 +35,7 @@ $1_$2_DIST_GCC_CC_OPTS = \ $1_$2_DIST_CC_OPTS = \ $$(SRC_CC_OPTS) \ $$($1_CC_OPTS) \ - -I$1/$2/build/autogen \ + -I$1/$2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/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) \ @@ -75,8 +75,8 @@ $1_$2_ALL_HSC2HS_OPTS = \ --cflag=-D__GLASGOW_HASKELL__=$$(if $$(filter 0,$3),$$(GhcCanonVersion),$$(ProjectVersionInt)) \ $$($1_$2_HSC2HS_CC_OPTS) \ $$($1_$2_HSC2HS_LD_OPTS) \ - --cflag=-I$1/$2/build/autogen \ - $$(if $$($1_PACKAGE),--cflag=-include --cflag=$1/$2/build/autogen/cabal_macros.h) \ + --cflag=-I$1/$2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/autogen \ + $$(if $$($1_PACKAGE),--cflag=-include --cflag=$1/$2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/autogen/cabal_macros.h) \ $$($$(basename $$<)_HSC2HS_OPTS) \ $$(EXTRA_HSC2HS_OPTS) |