Ensure mkUserGuidePart is compiled with current GHC version
authorBen Gamari <ben@smart-cactus.org>
Sat, 7 Jan 2017 14:59:56 +0000 (09:59 -0500)
committerBen Gamari <ben@smart-cactus.org>
Tue, 10 Jan 2017 18:22:30 +0000 (13:22 -0500)
configure.ac
utils/mkUserGuidePart/mkUserGuidePart.cabal.in [moved from utils/mkUserGuidePart/mkUserGuidePart.cabal with 78% similarity]

index 3ccaf1e..7dcde09 100644 (file)
@@ -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
similarity index 78%
rename from utils/mkUserGuidePart/mkUserGuidePart.cabal
rename to utils/mkUserGuidePart/mkUserGuidePart.cabal.in
index 93dc1cf..e07033c 100644 (file)
@@ -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@