Commitb3f2f6e

Neil Conway

committed

Use 'override' when appending text to LDFLAGS, so the build doesn't break

if the user has defined LDFLAGS themselves.

1 parent3738510 commitb3f2f6eCopy full SHA for b3f2f6e

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.195 2004/09/18 13:28:54 petere Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.196 2004/10/01 02:06:52 neilc Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -361,9 +361,9 @@ ifneq (,$(LIBOBJS))`
`361`	`361`	`LIBS := -lpgport$(LIBS)`
`362`	`362`	`ifdefPGXS`
`363`	`363`	`# where libpgport.a is installed`
`364`		`-LDFLAGS := -L$(libdir)$(LDFLAGS)`
	`364`	`+overrideLDFLAGS := -L$(libdir)$(LDFLAGS)`
`365`	`365`	`else`
`366`		`-LDFLAGS := -L$(top_builddir)/src/port$(LDFLAGS)`
	`366`	`+overrideLDFLAGS := -L$(top_builddir)/src/port$(LDFLAGS)`
`367`	`367`	`endif`
`368`	`368`	`endif`
`369`	`369`

Comments

(0)