postgres.git / summary / log / commit / refs
commit 20c105c4db56f784eebe39cb50ede8ad1bfa3899
Author: Andres Freund <andres@anarazel.de>
Date: Sun Aug 07 16:36:01 2022 +0000
First released in: 16.0
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
src/Makefile.shlib | 12 ++----------
src/makefiles/Makefile.solaris | 9 +--------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 2396bc247e5..2af6192f0f3 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -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
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 5496edcafc1..acdf44cc0f2 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -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
[parent: 8f12a4e7addc]