summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-12-27 09:03:44 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2015-12-28 10:23:37 +0100
commit01299ca83996710ec1572c952917157b1c2d139e (patch)
tree6840cf59bcc1b45baea77dfd33c3331336489c70 /ghc.mk
parent0054bcd42260d248e391ed01d6b3da4fefdad45c (diff)
downloadhaskell-01299ca83996710ec1572c952917157b1c2d139e.tar.gz
Synchronise ghci-package version with ghc-package
In order to simplify the task, the version munging logic has been radically simplified: Previously, in cases where the version contained dates as version components, the build-system would munge the version of the stage1 ghc package before registering the `ghc` package. However, this hack was already questionable at the time of its introduction (c.f. 7b45c46cbabe1288ea87bd9b94c57e010ed17e60). Simplifying the build-systems by avoiding such hacks may also help the shaking-up-ghc effort. So now we simply munge directly via the `.cabal` files, which gives a simpler picture, as now every stage is munged the same. Munging is only active when the first patch-level version component is a date. So stable snapshots and release candidates are unaffacted (as those have the date in the second patch-level version component) Reviewers: simonmar, bgamari, austin, thomie, ezyang Reviewed By: bgamari, thomie, ezyang Differential Revision: https://phabricator.haskell.org/D1673
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/ghc.mk b/ghc.mk
index 1bd54154bd..ba708a1f59 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1349,6 +1349,7 @@ distclean : clean
$(call removeFiles,mk/project.mk)
$(call removeFiles,compiler/ghc.cabal)
$(call removeFiles,ghc/ghc-bin.cabal)
+ $(call removeFiles,libraries/ghci/ghci.cabal)
$(call removeFiles,utils/runghc/runghc.cabal)
$(call removeFiles,settings)
$(call removeFiles,docs/users_guide/ug-book.xml)