git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8f12a4e)
solaris: Remove unnecessary gcc / gnu ld vs sun studio differences
Sun, 7 Aug 2022 16:36:01 +0000 (09:36 -0700)
Sun, 7 Aug 2022 16:36:01 +0000 (09:36 -0700)
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


diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 2396bc247e5865a60515c9e4297e8f35ac49c16d..2af6192f0f3cfd023122e5be6327a292c865430a 100644 (file)
--- 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 5496edcafc176882e03670c487ec4efd9634b938..acdf44cc0f2368abd6fceab15e4e90fa927e87e6 100644 (file)
--- 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
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /