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 /ghc | |
| 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 'ghc')
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 8 | ||||
| -rw-r--r-- | ghc/ghc.mk | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index adf81b3890..afb3939fc9 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -27,14 +27,14 @@ Executable ghc Default-Language: Haskell2010 Main-Is: Main.hs - Build-Depends: base >= 3 && < 5, + Build-Depends: base >= 4 && < 5, array >= 0.1 && < 0.6, bytestring >= 0.9 && < 0.11, directory >= 1 && < 1.3, process >= 1 && < 1.5, filepath >= 1 && < 1.5, - ghc-boot == 0.0.*, - ghc + ghc-boot == @ProjectVersionMunged@, + ghc == @ProjectVersionMunged@ if os(windows) Build-Depends: Win32 == 2.3.* @@ -49,7 +49,7 @@ Executable ghc Build-depends: containers == 0.5.*, deepseq == 1.4.*, - ghci, + ghci == @ProjectVersionMunged@, haskeline == 0.7.*, time == 1.6.*, transformers == 0.5.* diff --git a/ghc/ghc.mk b/ghc/ghc.mk index f8c6b09e3f..c0c78bdef6 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -22,15 +22,6 @@ ghc_stage2_CONFIGURE_OPTS += --flags=ghci ghc_stage3_CONFIGURE_OPTS += --flags=ghci endif -ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" -# If we munge the stage1 version, and we're using a devel snapshot for -# stage0, then stage1 may actually have an earlier version than stage0 -# (e.g. boot with ghc-7.5.20120316, building ghc-7.5). We therefore -# need to tell Cabal to use version 7.5 of the ghc package when building -# in ghc/stage1 -ghc_stage1_CONFIGURE_OPTS += --constraint "ghc == $(compiler_stage1_MUNGED_VERSION)" -endif - # This package doesn't pass the Cabal checks because data-dir # points outside the source directory. This isn't a real problem, so # we just skip the check. |