[commit: ghc] master: Remove RAWCPP_FLAGS (460eebe)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/460eebec65811c6a7bbe11645df322dda868e80d/ghc

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

commit 460eebec65811c6a7bbe11645df322dda868e80d
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Oct 7 08:47:52 2014 -0500

    Remove RAWCPP_FLAGS
    
    Summary:
    #9094 mentions to "remove the RAW_CPP bits from the ghc build system because
    they're not longer needed", "once the CPP settings ticket is merged #8683"
    
    #8683 was merged with 34f7e9a3c99850859901ca74370f55f1d4e2279a, Phab:D26.
    
    Test Plan: harbormaster
    
    Reviewers: carter, austin
    
    Reviewed By: austin
    
    Subscribers: simonmar, ezyang, carter
    
    Differential Revision: https://phabricator.haskell.org/D240
    
    GHC Trac Issues: #9094


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

460eebec65811c6a7bbe11645df322dda868e80d
 compiler/ghc.mk                | 4 ++--
 mk/config.mk.in                | 9 ---------
 rules/manual-package-config.mk | 4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 0f98960..b5f5dbc 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -263,10 +263,10 @@ compiler_CPP_OPTS += ${GhcCppOpts}
 define preprocessCompilerFiles
 # $0 = stage
 compiler/stage$1/build/Parser.y: compiler/parser/Parser.y.pp
-	$$(CPP) $$(RAWCPP_FLAGS) -P $$(compiler_CPP_OPTS) -x c $$< | grep -v '^#pragma GCC' > $$@
+	$$(CPP) -P $$(compiler_CPP_OPTS) -x c $$< | grep -v '^#pragma GCC' > $$@
 
 compiler/stage$1/build/primops.txt: compiler/prelude/primops.txt.pp compiler/stage$1/$$(PLATFORM_H)
-	$$(CPP) $$(RAWCPP_FLAGS) -P $$(compiler_CPP_OPTS) -Icompiler/stage$1 -x c $$< | grep -v '^#pragma GCC' > $$@
+	$$(CPP) -P $$(compiler_CPP_OPTS) -Icompiler/stage$1 -x c $$< | grep -v '^#pragma GCC' > $$@
 
 compiler/stage$1/build/primop-data-decl.hs-incl: compiler/stage$1/build/primops.txt $$$$(genprimopcode_INPLACE)
 	"$$(genprimopcode_INPLACE)" --data-decl          < $$< > $$@
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 392237f..4d860ec 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -626,15 +626,6 @@ CP			= cp
 # It's not easy to separate the CPP program from its flags, as
 # AC_PROG_CPP defines CPP as "/usr/bin/gcc -E"
 CPP			= @CPP@ @CPPFLAGS@
-#
-# RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
-# behave plausibly on Haskell sources.
-#
-# Clang in particular is a bit more annoying, so we suppress some warnings.
-RAWCPP_FLAGS            = -undef -traditional
-ifeq "$(CC_CLANG_BACKEND)" "1"
-RAWCPP_FLAGS           += -Wno-invalid-pp-token -Wno-unicode -Wno-trigraphs
-endif
 
 FIND			= @FindCmd@
 
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 10629aa..56eea70 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -16,7 +16,7 @@ $(call trace, manual-package-config($1))
 $(call profStart, manual-package-config($1))
 
 $1/dist/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) | $$$$(dir $$$$@)/.
-	$$(CPP) $$(RAWCPP_FLAGS) -P \
+	$$(CPP) -P \
 		-DTOP='"$$(TOP)"' \
 		$$($1_PACKAGE_CPP_OPTS) \
 		-x c $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) $$< -o $$@.raw
@@ -29,7 +29,7 @@ $1/dist/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) | $$$$(d
 # "make install", so we declare it as phony
 .PHONY: $1/dist/package.conf.install
 $1/dist/package.conf.install: | $$$$(dir $$$$@)/.
-	$$(CPP) $$(RAWCPP_FLAGS) -P \
+	$$(CPP) -P \
 		-DINSTALLING \
 		-DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \
 		-DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \