diff options
| author | wolfgang <unknown> | 2004-10-02 15:12:49 +0000 |
|---|---|---|
| committer | wolfgang <unknown> | 2004-10-02 15:12:49 +0000 |
| commit | 65fd4516b2c410f927337607254b46b5591dd85e (patch) | |
| tree | ba241fe7bdc5d0d9cf12fed39c1eaebf42a58c59 /mk/package.mk | |
| parent | 20d697a1c300663df2c1472e222e57c84c4385fc (diff) | |
| download | haskell-65fd4516b2c410f927337607254b46b5591dd85e.tar.gz | |
[project @ 2004-10-02 15:12:48 by wolfgang]
Deal with Apple's broken cpp 3.3 (you know, the one that inserts useless
#pragma lines into it's output) by filtering it's output through
grep -v.
This shouldn't be a problem for other platforms, and it's much simpler
than to make the parsers for ghc-pkg, genprimopcode and happy ignore
those lines.
MERGE TO STABLE
Diffstat (limited to 'mk/package.mk')
| -rw-r--r-- | mk/package.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/package.mk b/mk/package.mk index e81e7cee9d..ab6453bdd1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.38 2004/03/27 09:57:58 panne Exp $ +# $Id: package.mk,v 1.39 2004/10/02 15:12:48 wolfgang Exp $ ifneq "$(PACKAGE)" "" @@ -24,10 +24,12 @@ endif package.conf.inplace : package.conf.in $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \ + grep -v '^#pragma GCC' | \ sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@ package.conf.installed : package.conf.in $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \ + grep -v '^#pragma GCC' | \ sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@ # we could be more accurate here and add a dependency on |