Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 06bed48

Browse files
committed
Move CFLAGS for pginclude to the end of the command line.
1 parent a10fc5f commit 06bed48

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/tools/pginclude/pgcompinclude

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:
22
# report which #include files can not compile on their own
33
# takes -v option to display compile failure message and line numbers
4-
# $PostgreSQL: pgsql/src/tools/pginclude/pgcompinclude,v 1.7 2006/07/11 20:12:29 momjian Exp $
4+
# $PostgreSQL: pgsql/src/tools/pginclude/pgcompinclude,v 1.8 2006/07/14 01:05:13 momjian Exp $
55

66
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15
77
find . \( -name CVS -a -prune \) -o -name '*.h' -type f -print | while read FILE
@@ -13,9 +13,9 @@ do
1313
echo "void include_test() {" >>/tmp/$$.c
1414
pgdefine "$FILE" >>/tmp/$$.c
1515
echo "}" >>/tmp/$$.c
16-
cc $CFLAGS -fsyntax-only -Werror -Wall -Wmissing-prototypes \
16+
cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \
1717
-Wmissing-declarations -I/pg/include -I/pg/backend \
18-
-I/pg/interfaces/libpq -I`dirname $FILE` -c /tmp/$$.c \
18+
-I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -c /tmp/$$.c \
1919
-o /tmp/$$.o >/tmp/$$ 2>&1
2020
if [ "$?" -ne 0 ]
2121
then echo "$FILE"

src/tools/pginclude/pgrminclude

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:
22
# remove extra #include's
33

4-
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.15 2006/07/13 18:25:09 momjian Exp $
4+
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.16 2006/07/14 01:05:14 momjian Exp $
55

66
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
77
find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
@@ -61,9 +61,9 @@ do
6161
fi
6262
echo "}" >>/tmp/$$.c
6363

64-
cc $CFLAGS -fsyntax-only -Werror -Wall -Wmissing-prototypes \
64+
cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \
6565
-Wmissing-declarations -I/pg/include -I/pg/backend \
66-
-I/pg/interfaces/libpq -I`dirname $FILE` -c /tmp/$$.c \
66+
-I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -c /tmp/$$.c \
6767
-o /tmp/$$.o >/tmp/$$ 2>&1
6868
if [ "$?" -eq 0 ]
6969
then echo "$FILE $INCLUDE"

0 commit comments

Comments
 (0)