diff options
| author | Yuri de Wit <admin@rodlogic.net> | 2014-11-07 07:32:26 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-11-07 07:32:27 -0600 |
| commit | 37d64a51348a803a1cf974d9e97ec9231215064a (patch) | |
| tree | 73682cbf7d0c74a38a678b4edd00da0ca88f7974 /ghc.mk | |
| parent | 24e05f48f3a3a1130ecd5a46e3089b76ee5a2304 (diff) | |
| download | haskell-37d64a51348a803a1cf974d9e97ec9231215064a.tar.gz | |
small parser/lexer cleanup
Summary:
The last three '#define ...' macros were removed from Parser.y.pp and this file was renamed to Parser.y.
This basically got rid of a CPP step in the build.
Also converted two modules in compiler/parser/ from .lhs to .hs.
Test Plan: Does it build? Yes, I performed a full build here and things are looking good.
Reviewers: austin
Reviewed By: austin
Subscribers: adamse, thomie, carter, simonmar
Differential Revision: https://phabricator.haskell.org/D411
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -359,7 +359,7 @@ endif # Packages to build # The lists of packages that we *actually* going to build in each stage: # -# $(PACKAGES_STAGE0) +# $(PACKAGES_STAGE0) # $(PACKAGES_STAGE1) # $(PACKAGES_STAGE2) # @@ -630,7 +630,7 @@ BUILD_DIRS += includes BUILD_DIRS += rts ifneq "$(BINDIST)" "YES" -BUILD_DIRS += bindisttest +BUILD_DIRS += bindisttest BUILD_DIRS += utils/genapply endif @@ -696,10 +696,10 @@ stage1_libs : $(ALL_STAGE1_LIBS) # ---------------------------------------------- # Per-package compiler flags -# -# If you want to add per-package compiler flags, this +# +# If you want to add per-package compiler flags, this # is the place to do it. Do it like this for package <pkg> -# +# # libraries/<pkg>_dist-boot_HC_OPTS += -Wwarn # libraries/<pkg>_dist-install_HC_OPTS += -Wwarn @@ -1140,7 +1140,7 @@ sdist-ghc-prep : $(call sdist_ghc_file,compiler,stage2,cmm,,CmmLex,x) $(call sdist_ghc_file,compiler,stage2,cmm,,CmmParse,y) $(call sdist_ghc_file,compiler,stage2,parser,,Lexer,x) - $(call sdist_ghc_file,compiler,stage2,parser,,Parser,y.pp) + $(call sdist_ghc_file,compiler,stage2,parser,,Parser,y) $(call sdist_ghc_file,utils/hpc,dist-install,,,HpcParser,y) $(call sdist_ghc_file,utils/genprimopcode,dist,,,Lexer,x) $(call sdist_ghc_file,utils/genprimopcode,dist,,,Parser,y) @@ -1225,7 +1225,6 @@ CLEAN_FILES += includes/ghcautoconf.h CLEAN_FILES += includes/ghcplatform.h CLEAN_FILES += includes/ghcversion.h CLEAN_FILES += utils/ghc-pkg/Version.hs -CLEAN_FILES += compiler/parser/Parser.y CLEAN_FILES += compiler/prelude/primops.txt CLEAN_FILES += $(wildcard compiler/primop*incl) |