diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-08-04 15:54:08 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-08-05 09:21:49 +0100 |
| commit | 59534b8022acf97e9f475cde14b85cd0d74088ac (patch) | |
| tree | 3692956f264f1b6d51348fff57e6294522f58ef5 /mk | |
| parent | 8feb2813f129532b81be3ae3749af0e5acc40dae (diff) | |
| download | haskell-59534b8022acf97e9f475cde14b85cd0d74088ac.tar.gz | |
Update to work with Alex 3.0: basically disabling Alex's new Unicode
support because we have our own, and defining alexGetByte instead of
alexGetChar (actually we also define alexGetChar, for backwards
compatibility).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index e39c5c7381..0adaf69222 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -760,10 +760,17 @@ SRC_HAPPY_OPTS = -agc --strict # ALEX = @AlexCmd@ ALEX_VERSION = @AlexVersion@ +Alex3 = @Alex3@ # # Options to pass to Happy when we're going to compile the output with GHC # +ifeq "$(Alex3)" "YES" +# We aren't using the Unicode support in Alex 3.0 yet, in fact we do our own +# Unicode handling, so diable Alex's. +SRC_ALEX_OPTS = -g --latin1 +else SRC_ALEX_OPTS = -g +endif # Should we build haddock docs? HADDOCK_DOCS = YES |