opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Unfortunately one with_gnu_ld reference remains, otherwise we could remove the
configure support for determining with_gnu_ld.

Reviewed-By: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de
This commit is contained in:
Andres Freund 2022-08-07 09:36:01 -07:00
parent 8f12a4e7ad
commit 20c105c4db
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.shlib
View File

@ -188,17 +188,9 @@ ifeq ($(PORTNAME), linux)
endif
ifeq ($(PORTNAME), solaris)
ifeq ($(GCC), yes)
LINK.shared = $(COMPILER) -shared -Wl,-Bsymbolic
else
LINK.shared = $(COMPILER) -G -Bsymbolic
endif
LINK.shared = $(COMPILER) -shared -Wl,-Bsymbolic
ifdef soname
ifeq ($(with_gnu_ld), yes)
LINK.shared += -Wl,-soname,$(soname)
else
LINK.shared += -h $(soname)
endif
LINK.shared += -Wl,-soname,$(soname)
endif
endif

9
src/makefiles/Makefile.solaris
View File

@ -1,21 +1,14 @@
# src/makefiles/Makefile.solaris
AROPT = crs
rpath = -Wl,-rpath,'$(rpathdir)'
ifeq ($(with_gnu_ld), yes)
export_dynamic = -Wl,-E
rpath = -Wl,-rpath,'$(rpathdir)'
else
rpath = -Wl,-R'$(rpathdir)'
endif
# Rule for building a shared library from a single .o file
%.so: %.o
ifeq ($(GCC), yes)
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
else
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -G -o $@
endif
sqlmansect = 5sql