diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-01-07 09:59:56 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-01-10 13:22:30 -0500 |
| commit | fe75d2d4db44cee72d505bba24bd44c1a2a75613 (patch) | |
| tree | 096116b6d4348c6b98f8f086742731fd141d95d7 | |
| parent | 0a6c257de5c217436ec61fdf4b06bca059181f83 (diff) | |
| download | haskell-fe75d2d4db44cee72d505bba24bd44c1a2a75613.tar.gz | |
Ensure mkUserGuidePart is compiled with current GHC version
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | utils/mkUserGuidePart/mkUserGuidePart.cabal.in (renamed from utils/mkUserGuidePart/mkUserGuidePart.cabal) | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3ccaf1ef58..7dcde099ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1157,7 +1157,7 @@ checkMake380() { checkMake380 make checkMake380 gmake -AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt utils/mkUserGuidePart/mkUserGuidePart.cabal distrib/configure.ac]) AC_OUTPUT if test "$print_make_warning" = "true"; then diff --git a/utils/mkUserGuidePart/mkUserGuidePart.cabal b/utils/mkUserGuidePart/mkUserGuidePart.cabal.in index 93dc1cfec0..e07033cd02 100644 --- a/utils/mkUserGuidePart/mkUserGuidePart.cabal +++ b/utils/mkUserGuidePart/mkUserGuidePart.cabal.in @@ -1,5 +1,5 @@ Name: mkUserGuidePart -Version: 0.1 +Version: @ProjectVersionMunged@ Copyright: XXX License: BSD3 -- XXX License-File: LICENSE @@ -47,5 +47,9 @@ Executable mkUserGuidePart Options.Verbosity Options.Warnings Build-Depends: base >= 3 && < 5, - ghc + -- mkUserGuidePart uses the compiler's DynFlags to determine + -- a few options-related properties of the compiler. + -- Consequently we should make sure we are building against + -- the right compiler. + ghc == @ProjectVersionMunged@ |