Commit8e57975

committed

Clean up rpath handling for HPUX --- we can't use the cc-style rpath

switch syntax when calling ld directly.

1 parent466fb06 commit8e57975Copy full SHA for 8e57975

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.88 2004/11/17 17:08:15 tgl Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.89 2004/11/19 21:27:42 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -154,9 +154,15 @@ ifeq ($(PORTNAME), hpux)`
`154`	`154`	SHLIB_LINK+= `$(CC) $(LDFLAGS) -print-libgcc-file-name`
`155`	`155`	`endif`
`156`	`156`	`ifeq ($(with_gnu_ld), yes)`
`157`		`- LINK.shared= $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname) -Wl,+b -Wl,$(libdir)`
	`157`	`+ LINK.shared= $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname)`
`158`	`158`	`else`
`159`		`- LINK.shared= $(LD) +h $(soname) -b +b $(libdir)`
	`159`	`+ # can't use the CC-syntax rpath pattern here`
	`160`	`+ rpath =`
	`161`	`+ ifeq ($(enable_rpath), yes)`
	`162`	`+ LINK.shared= $(LD) +h $(soname) -b +b $(rpathdir)`
	`163`	`+ else`
	`164`	`+ LINK.shared= $(LD) +h $(soname) -b`
	`165`	`+ endif`
`160`	`166`	`endif`
`161`	`167`	`endif`
`162`	`168`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ LIBS := -lxnet $(LIBS)`
`19`	`19`	`# Set up rpath so that the executables don't need SHLIB_PATH to be set.`
`20`	`20`	`# (Note: --disable-rpath is a really bad idea on this platform...)`
`21`	`21`	`ifeq ($(with_gnu_ld), yes)`
`22`		`- rpath = -Wl,-rpath,$(rpathdir)`
	`22`	`+ rpath = -Wl,-rpath -Wl,$(rpathdir)`
`23`	`23`	`else`
`24`		`- rpath = -Wl,+b,$(rpathdir)`
	`24`	`+ rpath = -Wl,+b -Wl,$(rpathdir)`
`25`	`25`	`endif`
`26`	`26`
`27`	`27`	`# catch null pointer dereferences`

Comments

(0)