Commit3b86b46

committed

Make pgcompinclude/pgrminclude less tied to Bruce's personal machine.

Not everyone has /pg linked to the src subdirectory of their PostgreSQLtree. Also, cc isn't the way to invoke the compiler everywhere.

1 parent65d9aed commit3b86b46Copy full SHA for 3b86b46

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`# takes -v option to display compile failure message and line numbers`
`4`	`4`	`# src/tools/pginclude/pgcompinclude`
`5`	`5`
	`6`	`+: ${CC:=cc}`
	`7`	`+: ${PGSRC:=src}`
	`8`	`+`
`6`	`9`	`if ! pgdefine`
`7`	`10`	`thenecho "pgdefine must be in your PATH" 1>&2`
`8`	`11`	`exit 1`
`@@ -29,9 +32,9 @@ do`
`29`	`32`
`30`	`33`	`# Use -O1 to get warnings only generated by optimization,`
`31`	`34`	`# but -O2 is too slow.`
`32`		`-cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \`
`33`		`--Wmissing-declarations -I/pg/include -I/pg/backend \`
`34`		--I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -O1 -c /tmp/$$.c \
	`35`	`+$CC -fsyntax-only -Werror -Wall -Wmissing-prototypes \`
	`36`	`+-Wmissing-declarations -I$PGSRC/include -I$PGSRC/backend \`
	`37`	+-I$PGSRC/interfaces/libpq -I`dirname $FILE` $CFLAGS -O1 -c /tmp/$$.c \
`35`	`38`	`-o /tmp/$$.o >/tmp/$$ 2>&1`
`36`	`39`	`if [ "$?" -ne 0 ]`
`37`	`40`	`thenecho "$FILE"`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`# be compiled on the platform from which pgrminclude is run cannot be`
`19`	`19`	`# processed, and are skipped.`
`20`	`20`
	`21`	`+: ${CC:=cc}`
	`22`	`+: ${PGSRC:=src}`
	`23`	`+`
`21`	`24`	`if ! pgdefine`
`22`	`25`	`thenecho "pgdefine must be in your PATH" 1>&2`
`23`	`26`	`exit 1`
`@@ -104,9 +107,9 @@ compile_file() {`
`104`	`107`
`105`	`108`	`# Use -O1 to get warnings only generated by optimization,`
`106`	`109`	`# but -O2 is too slow.`
`107`		`-cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \`
`108`		`--Wmissing-declarations -I/pg/include -I/pg/backend \`
`109`		--I/pg/interfaces/libpq -I`dirname $FILE` $CFLAGS -O1 -c /tmp/$$.c \
	`110`	`+$CC -fsyntax-only -Werror -Wall -Wmissing-prototypes \`
	`111`	`+-Wmissing-declarations -I$PGSRC/include -I$PGSRC/backend \`
	`112`	+-I$PGSRC/interfaces/libpq -I`dirname $FILE` $CFLAGS -O1 -c /tmp/$$.c \
`110`	`113`	`-o /tmp/$$.o >/tmp/$$ 2>&1`
`111`	`114`	`if [ "$?" -eq 0 ]`
`112`	`115`	`then[ "$INCLUDE" -o "$VERBOSE" ] && echo "$FILE $INCLUDE"`

Comments

(0)