diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-01 08:37:09 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-01 08:40:13 +0100 |
| commit | 0511c0ab09f705c3012b405781c9398a143b0e38 (patch) | |
| tree | bc8f4dc47da37c285adafa5735b6c34f7f98548a /rules/manual-package-config.mk | |
| parent | 7ad384604652b87b68d32bdaff4ef7f94daf9d35 (diff) | |
| download | haskell-0511c0ab09f705c3012b405781c9398a143b0e38.tar.gz | |
Revert "Remove RAWCPP_FLAGS"
This reverts commit 460eebec65811c6a7bbe11645df322dda868e80d.
Thomas requested to revert the commit with the words:
> Please revert this commit, it is horribly wrong. I'll have a proper look
> later, but not supplying `-traditional` to the C preprocessor is the cause
> of #9828.
the reverted commit was related to #9094
Diffstat (limited to 'rules/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 56eea700ac..10629aaa2f 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) -P \ + $$(CPP) $$(RAWCPP_FLAGS) -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) -P \ + $$(CPP) $$(RAWCPP_FLAGS) -P \ -DINSTALLING \ -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \ -DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \ |