summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2018-03-03 16:16:41 -0500
committerBen Gamari <ben@smart-cactus.org>2018-03-03 21:50:31 -0500
commit8f0b2f5eadf0fcb47c581907205a9db686214a69 (patch)
tree63e503e73e17c1ac7d9439be27392bbad05652c6 /rules
parent4631ceb261cb08756b955c6b495d5e719d35ab62 (diff)
downloadhaskell-8f0b2f5eadf0fcb47c581907205a9db686214a69.tar.gz
Bump Cabal submodule to 2.2
Requires some ghc-cabal changes as well. Test Plan: ./validate Reviewers: hvr, bgamari Reviewed By: bgamari Subscribers: hsyl20, erikd, alpmestan, rwbarton, thomie, carter Differential Revision: https://phabricator.haskell.org/D4453
Diffstat (limited to 'rules')
-rw-r--r--rules/build-package.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk
index fb04f02f27..c29155c582 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -155,7 +155,7 @@ endif
# Don't put bootstrapping packages in the bindist
ifneq "$3" "0"
-BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $1/$2/setup-config $1/LICENSE
+BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $$(wildcard $1/dist-install/build/*.buildinfo) $1/$2/setup-config $1/LICENSE
BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
endif