diff options
| author | Tobias Dammers <tdammers@gmail.com> | 2017-11-27 14:00:50 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-27 20:28:37 -0500 |
| commit | eb86e867694bceedfb47a527d71429197ffe6dda (patch) | |
| tree | a79e36ac2477327d70c4cdc801583f0ef10819ce /ghc.mk | |
| parent | df1a0c0c62b6433b2b4584a133a6d92491b71e08 (diff) | |
| download | haskell-eb86e867694bceedfb47a527d71429197ffe6dda.tar.gz | |
Don't call alex for Cabal lib during GHC build
The Cabal library now commits `Lexer.hs` directly to the source tree,
so the build step where we'd call alex ourselves to generate that file
is no longer necessary, nor will it work.
See also: https://ghc.haskell.org/trac/ghc/ticket/14459
Reviewers: bgamari, hvr
Reviewed By: bgamari
Subscribers: rwbarton, thomie, carter
GHC Trac Issues: #14459
Differential Revision: https://phabricator.haskell.org/D4240
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1257,7 +1257,15 @@ $(eval $(call sdist-ghc-file,compiler,stage2,parser,Parser,y)) $(eval $(call sdist-ghc-file,utils/hpc,dist-install,,HpcParser,y)) $(eval $(call sdist-ghc-file,utils/genprimopcode,dist,,Lexer,x)) $(eval $(call sdist-ghc-file,utils/genprimopcode,dist,,Parser,y)) -$(eval $(call sdist-ghc-file2,libraries/Cabal/Cabal,dist-install,Distribution/Parsec,Lexer,x)) + +# Recent Cabal library versions have a pre-generated Lexer.hs in the source +# repo, and have moved Lexer.x out of the way, so trying to generate it from +# here no longer works, and is no longer necessary. +# According to https://github.com/haskell/cabal/issues/4633 however, this is +# only a temporary solution, so we will probably have to adjust to whatever +# the proper solution is going to be once there is one. +# +# $(eval $(call sdist-ghc-file2,libraries/Cabal/Cabal,dist-install,Distribution/Parsec,Lexer,x)) .PHONY: sdist-ghc-prep sdist-ghc-prep : sdist-ghc-prep-tree |