summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-02-17 08:36:56 -0600
committerAustin Seipp <austin@well-typed.com>2015-02-17 09:06:11 -0600
commit555eef1d0fb5a7fd07971c1201b3c520f01125d4 (patch)
treeda0cb249cbb06d41b0111b82aad642efd5365eb0 /rules
parent49d99ebf6e341e26caf1d3db794cb6fa06ee72f6 (diff)
downloadhaskell-555eef1d0fb5a7fd07971c1201b3c520f01125d4.tar.gz
Remove RAWCPP_FLAGS (Task #9094)
Reviewers: carter, austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D648 GHC Trac Issues: #9094
Diffstat (limited to 'rules')
-rw-r--r--rules/manual-package-config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 10629aaa2f..fe3a5e3b08 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 \
+ $$(HS_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 \
+ $$(HS_CPP) -P \
-DINSTALLING \
-DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \
-DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \