Commit1f9010c

committed

> > This patch corrects the use of rpath and export options when compiling

> > on postgres on Unixware with GCC built with gnu-as and gnu-ld.Remove leading spaces in conditional tests in patch and Makefile.aix.Nicolas Bazin

1 parent80f46fa commit1f9010cCopy full SHA for 1f9010c

File tree

+19

-10

lines changed

+19

-10

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ AROPT = crs`
`8`	`8`
`9`	`9`	`DLSUFFIX = .so`
`10`	`10`	`ifneq ($(GCC), yes)`
`11`		`-ifeq ($(host_os), aix3.2.5)`
`12`		`-LDFLAGS_SL = -e _nostart`
`13`		`-else`
`14`		`-LDFLAGS_SL = -bnoentry`
`15`		`-endif`
	`11`	`+ifeq ($(host_os), aix3.2.5)`
	`12`	`+LDFLAGS_SL = -e _nostart`
	`13`	`+else`
	`14`	`+LDFLAGS_SL = -bnoentry`
	`15`	`+endif`
`16`	`16`	`endif`
`17`	`17`
`18`	`18`
`@@ -28,11 +28,11 @@ $(POSTGRES_IMP):`
`28`	`28`	`ifeq ($(host_os), aix3.2.5)`
`29`	`29`	`$(MKLDEXPORT) postgres $(bindir) > $@`
`30`	`30`	`else`
`31`		`-ifneq (,$(findstring aix4.1, $(host_os)))`
	`31`	`+ifneq (,$(findstring aix4.1, $(host_os)))`
`32`	`32`	`$(MKLDEXPORT) postgres $(bindir) > $@`
`33`		`-else`
	`33`	`+else`
`34`	`34`	`$(MKLDEXPORT) postgres . > $@`
`35`		`-endif`
	`35`	`+endif`
`36`	`36`	`endif`
`37`	`37`	`$(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) $(LIBS)`
`38`	`38`

Lines changed: 11 additions & 2 deletions

Comments

(0)