X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fmanual-package-config.mk;h=c37f204d9583ef427f5940a2e6c8747ac666ee1a;hb=e11c554e94c39223ea55991a552ccb244dfe4364;hp=9fc87ec58424c46d2174cab024a1b00d9fdcf8a5;hpb=68617fca55bbc38004dfed3af27eed47b9cb3ab0;p=ghc-hetmet.git

diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 9fc87ec..c37f204 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -12,14 +12,16 @@
 
 
 define manual-package-config # args: $1 = dir
+$(call trace, manual-package-config($1))
+$(call profStart, manual-package-config($1))
 
 $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) $$< | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $$< -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' > $$@
 
 	"$$(GHC_PKG_INPLACE)" update --force $$@
 
@@ -32,13 +34,14 @@ $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 | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
 
 distclean : clean_$1_package.conf
 .PHONY: clean_$1_package.conf
 clean_$1_package.conf :
 	"$$(RM)" $$(RM_OPTS) $1/package.conf.install $1/package.conf.inplace
 
+$(call profEnd, manual-package-config($1))
 endef