[commit: ghc] master: Ensure mkUserGuidePart is compiled with current GHC version (fe75d2d)

git at git.haskell.org git at git.haskell.org
Tue Jan 10 19:21:56 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fe75d2d4db44cee72d505bba24bd44c1a2a75613/ghc

>---------------------------------------------------------------

commit fe75d2d4db44cee72d505bba24bd44c1a2a75613
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jan 7 09:59:56 2017 -0500

    Ensure mkUserGuidePart is compiled with current GHC version


>---------------------------------------------------------------

fe75d2d4db44cee72d505bba24bd44c1a2a75613
 configure.ac                                                      | 2 +-
 .../{mkUserGuidePart.cabal => mkUserGuidePart.cabal.in}           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3ccaf1e..7dcde09 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
similarity index 78%
rename from utils/mkUserGuidePart/mkUserGuidePart.cabal
rename to utils/mkUserGuidePart/mkUserGuidePart.cabal.in
index 93dc1cf..e07033c 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@
 



More information about the ghc-commits mailing list