From 06bed485b084c34a56c437f01ca5539e18ac311f Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 14 Jul 2006 01:05:14 +0000
Subject: [PATCH] Move CFLAGS for pginclude to the end of the command line.
---
src/tools/pginclude/pgcompinclude | 6 +++---
src/tools/pginclude/pgrminclude | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude
index 0ffd7bab40f..5b9564d4905 100755
--- a/src/tools/pginclude/pgcompinclude
+++ b/src/tools/pginclude/pgcompinclude
@@ -1,7 +1,7 @@
:
# report which #include files can not compile on their own
# takes -v option to display compile failure message and line numbers
-# $PostgreSQL: pgsql/src/tools/pginclude/pgcompinclude,v 1.7 2006/07/11 20:12:29 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pginclude/pgcompinclude,v 1.8 2006/07/14 01:05:13 momjian Exp $
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -name '*.h' -type f -print | while read FILE
@@ -13,9 +13,9 @@ do
echo "void include_test() {" >>/tmp/$$.c
pgdefine "$FILE" >>/tmp/$$.c
echo "}" >>/tmp/$$.c
- cc $CFLAGS -fsyntax-only -Werror -Wall -Wmissing-prototypes \
+ cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \
-Wmissing-declarations -I/pg/include -I/pg/backend \
- -I/pg/interfaces/libpq -I`dirname $FILE` -c /tmp/$$.c \
+ -I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -c /tmp/$$.c \
-o /tmp/$$.o >/tmp/$$ 2>&1
if [ "$?" -ne 0 ]
then echo "$FILE"
diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude
index 11bd0d638e9..7944c9d735f 100755
--- a/src/tools/pginclude/pgrminclude
+++ b/src/tools/pginclude/pgrminclude
@@ -1,7 +1,7 @@
:
# remove extra #include's
-# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.15 2006/07/13 18:25:09 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.16 2006/07/14 01:05:14 momjian Exp $
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
@@ -61,9 +61,9 @@ do
fi
echo "}" >>/tmp/$$.c
- cc $CFLAGS -fsyntax-only -Werror -Wall -Wmissing-prototypes \
+ cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \
-Wmissing-declarations -I/pg/include -I/pg/backend \
- -I/pg/interfaces/libpq -I`dirname $FILE` -c /tmp/$$.c \
+ -I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -c /tmp/$$.c \
-o /tmp/$$.o >/tmp/$$ 2>&1
if [ "$?" -eq 0 ]
then echo "$FILE $INCLUDE"
--
GitLab