Commit20c105c

committed

solaris: Remove unnecessary gcc / gnu ld vs sun studio differences

Unfortunately one with_gnu_ld reference remains, otherwise we could remove theconfigure support for determining with_gnu_ld.Reviewed-By: Thomas Munro <thomas.munro@gmail.com>Discussion:https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de

1 parent8f12a4e commit20c105cCopy full SHA for 20c105c

File tree

-18

lines changed

-18

lines changed

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,17 +188,9 @@ ifeq ($(PORTNAME), linux)`
`188`	`188`	`endif`
`189`	`189`
`190`	`190`	`ifeq ($(PORTNAME), solaris)`
`191`		`- ifeq ($(GCC), yes)`
`192`		`- LINK.shared= $(COMPILER) -shared -Wl,-Bsymbolic`
`193`		`- else`
`194`		`- LINK.shared= $(COMPILER) -G -Bsymbolic`
`195`		`- endif`
	`191`	`+ LINK.shared= $(COMPILER) -shared -Wl,-Bsymbolic`
`196`	`192`	`ifdef soname`
`197`		`- ifeq ($(with_gnu_ld), yes)`
`198`		`- LINK.shared+= -Wl,-soname,$(soname)`
`199`		`- else`
`200`		`- LINK.shared+= -h $(soname)`
`201`		`- endif`
	`193`	`+ LINK.shared+= -Wl,-soname,$(soname)`
`202`	`194`	`endif`
`203`	`195`	`endif`
`204`	`196`

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,14 @@`
`1`	`1`	`# src/makefiles/Makefile.solaris`
`2`	`2`
`3`	`3`	`AROPT = crs`
	`4`	`+rpath = -Wl,-rpath,'$(rpathdir)'`
`4`	`5`
`5`	`6`	`ifeq ($(with_gnu_ld), yes)`
`6`	`7`	`export_dynamic = -Wl,-E`
`7`		`-rpath = -Wl,-rpath,'$(rpathdir)'`
`8`		`-else`
`9`		`-rpath = -Wl,-R'$(rpathdir)'`
`10`	`8`	`endif`
`11`	`9`
`12`		`-`
`13`	`10`	`# Rule for building a shared library from a single .o file`
`14`	`11`	`%.so: %.o`
`15`		`-ifeq ($(GCC), yes)`
`16`	`12`	`$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@`
`17`		`-else`
`18`		`-$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -G -o $@`
`19`		`-endif`
`20`	`13`
`21`	`14`	`sqlmansect = 5sql`

Comments

(0)