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/build-package-data.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/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 89b742c613..e340c8bd43 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -113,7 +113,7 @@ $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)") ifneq "$$(BINDIST)" "YES" ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" $1/$2/inplace-pkg-config : $1/$2/package-data.mk -$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk +$1/$2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/autogen/cabal_macros.h : $1/$2/package-data.mk # This rule configures the package, generates the package-data.mk file # for our build system, and registers the package for use in-place in |