diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-07-15 15:22:37 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-07-15 15:22:37 +0000 |
| commit | 0933c7a49d2755e961c1c1e04ed50f164b2ead6e (patch) | |
| tree | 2b28badbf91cb3745ae85fd0837376f098d94fe7 /rules/manual-package-config.mk | |
| parent | b990a08bc3da9d5f61f44cb661240ca154fa74d7 (diff) | |
| download | haskell-0933c7a49d2755e961c1c1e04ed50f164b2ead6e.tar.gz | |
Split up some make commands, so that errors aren't overlooked
When we ask make to run "a | b", if a fails then the pipeline might
still exit successfuly.
Diffstat (limited to 'rules/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 9fc87ec584..8d1eba9322 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -17,9 +17,9 @@ $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,9 +32,9 @@ $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 |