[commit: ghc] wip/tdammers/T14459: Skip generating Lexer.hs in Cabal lib (ccbe7a8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/tdammers/T14459
Link       : http://ghc.haskell.org/trac/ghc/changeset/ccbe7a8b7b0b90b4bfb29564d9e578274da958bc/ghc

>---------------------------------------------------------------

commit ccbe7a8b7b0b90b4bfb29564d9e578274da958bc
Author: Tobias Dammers <tdammers at gmail.com>
Date:   Mon Nov 27 16:55:13 2017 +0100

    Skip generating Lexer.hs in Cabal lib
    
    Newer Cabal version has moved Lexer.x outside the main source tree, and
    added a pregenerated Lexer.hs, which we will use instead.


>---------------------------------------------------------------

ccbe7a8b7b0b90b4bfb29564d9e578274da958bc
 ghc.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index e653aae..38c165d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -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