diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-01-04 21:46:47 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-01-04 21:46:47 +0000 |
| commit | 9efc323b5b57a0b4d50008c942a90a45dc51ee2d (patch) | |
| tree | aec496aa4611e8d70b0acb5060ea8dc362025d59 /mk | |
| parent | 70f981b9dc28d94748ce91469df5bc12f0c6c60c (diff) | |
| download | haskell-9efc323b5b57a0b4d50008c942a90a45dc51ee2d.tar.gz | |
Require HsColour by default
This should stop us ending up without HsColour'ed sources on some
platforms.
We also now tell Cabal where to find HsColour, rather than it finding
it itself.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | mk/validate-settings.mk | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index c2ddea107e..495194d28a 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -187,6 +187,8 @@ XMLDocWays= # Should we build haddock docs? HADDOCK_DOCS = YES +# And HsColour the sources? +HSCOLOUR_SRCS = YES # Should we build latex docs? LATEX_DOCS = NO diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 14ae5b2d24..20a98a00d8 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -2,6 +2,7 @@ WERROR = -Werror HADDOCK_DOCS = YES +HSCOLOUR_SRCS = YES SRC_CC_OPTS = $(WERROR) SRC_HC_OPTS = $(WERROR) -H64m -O0 -fasm GhcStage1HcOpts = -O -fasm |