diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-01-08 19:36:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-01-08 23:11:06 +0000 |
| commit | 9e452874df05f5f98243576ffaefc2f356358038 (patch) | |
| tree | bad3b659234883643d088b48034a6bd99e2b851f /rules | |
| parent | 4c49eb512499255fe7de0e6cfc08ed138957d583 (diff) | |
| download | haskell-9e452874df05f5f98243576ffaefc2f356358038.tar.gz | |
Refactoring
This is working towards being able to put ghcautoconf.h and
ghcplatform.h in includes/dist
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/hs-suffix-rules-srcdir.mk | 4 | ||||
| -rw-r--r-- | rules/manual-package-config.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk index ce579c4d09..73d967a150 100644 --- a/rules/hs-suffix-rules-srcdir.mk +++ b/rules/hs-suffix-rules-srcdir.mk @@ -52,10 +52,10 @@ endif # .hs->.o rule, I don't know why --SDM $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h | $$$$(dir $$$$@)/. - "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@ + "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) -x c -c $$< -o $$@ $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h - "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@ + "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) -x c -c $$< -o $$@ # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc # "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 6f350dcac0..848fe1b4ce 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -19,7 +19,7 @@ $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE) $$(CPP) $$(RAWCPP_FLAGS) -P \ -DTOP='"$$(TOP)"' \ $$($1_PACKAGE_CPP_OPTS) \ - -x c -I$$(GHC_INCLUDE_DIR) $$< -o $$@.raw + -x c $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) $$< -o $$@.raw grep -v '^#pragma GCC' $$@.raw | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' > $$@ @@ -34,7 +34,7 @@ $1/package.conf.install: -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \ -DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \ $$($1_PACKAGE_CPP_OPTS) \ - -x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in -o $$@.raw + -x c $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) $1/package.conf.in -o $$@.raw grep -v '^#pragma GCC' $$@.raw | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$$@ |