-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Along the way, I discovered that `template-haskell.cabal` was hard-coding the GHC version (in the form of its `ghc-boot-th` version bounds), so I decided to make life a little simpler in the future by generating `template-haskell.cabal` with autoconf.
- Loading branch information
1 parent
eda456f
commit aa79f65
Showing
5 changed files
with
13 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ dnl | |
# see what flags are available. (Better yet, read the documentation!) | ||
# | ||
|
||
AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.7], [[email protected]], [ghc-AC_PACKAGE_VERSION]) | ||
AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.9], [[email protected]], [ghc-AC_PACKAGE_VERSION]) | ||
|
||
# Set this to YES for a released version, otherwise NO | ||
: ${RELEASE=NO} | ||
|
@@ -1332,7 +1332,7 @@ checkMake380() { | |
checkMake380 make | ||
checkMake380 gmake | ||
|
||
AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.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 rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac]) | ||
AC_OUTPUT | ||
[ | ||
if test "$print_make_warning" = "true"; then | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
test('haddockHtmlTest', | ||
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock], | ||
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock], | ||
makefile_test, | ||
['htmlTest']) | ||
|
||
test('haddockLatexTest', | ||
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock], | ||
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock], | ||
makefile_test, | ||
['latexTest']) | ||
|
||
test('haddockHoogleTest', | ||
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock], | ||
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock], | ||
makefile_test, | ||
['hoogleTest']) | ||
|
||
test('haddockHypsrcTest', | ||
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock], | ||
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock], | ||
makefile_test, | ||
['hypsrcTest']) |
Submodule haddock
updated
from edd500 to 1a4715