diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-27 09:03:44 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-28 10:23:37 +0100 |
| commit | 01299ca83996710ec1572c952917157b1c2d139e (patch) | |
| tree | 6840cf59bcc1b45baea77dfd33c3331336489c70 /rules | |
| parent | 0054bcd42260d248e391ed01d6b3da4fefdad45c (diff) | |
| download | haskell-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 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/foreachLibrary.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 17b87e021e..e46ecd6d61 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -134,10 +134,8 @@ endif endif "$$(ghc-cabal_INPLACE)" configure $1 $2 "$$($1_$2_dll0_MODULES)" --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) ifeq "$$($1_$2_PROG)" "" -ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" $$(call cmd,$1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config endif -endif endif # NO_GENERATED_MAKEFILE_RULES endif # BINDIST diff --git a/rules/foreachLibrary.mk b/rules/foreachLibrary.mk index 1a91cd9d77..1f44c9ec5f 100644 --- a/rules/foreachLibrary.mk +++ b/rules/foreachLibrary.mk @@ -38,6 +38,7 @@ define foreachLibrary # $1 = function to call for each library # We will give it the package path and the tag as arguments $$(foreach hashline,libraries/ghc-boot#-#no-remote-repo#no-vcs \ + libraries/ghci#-#no-remote-repo#no-vcs \ libraries/base#-#no-remote-repo#no-vcs \ libraries/ghc-prim#-#no-remote-repo#no-vcs \ libraries/integer-gmp#-#no-remote-repo#no-vcs \ |