Move CFLAGS for pginclude to the end of the command line.

diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude
index 0ffd7bab40fbfef94084d00c533f733460121bb4..5b9564d490561b45075fc4cfeb90b5b6d51f4bfd 100755 (executable)
--- 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 11bd0d638e90b7616f6af792fc4341a7dd1b568c..7944c9d735fefee96d83e26130a082b10315739b 100755 (executable)
--- 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"