aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2001-09-11 23:20:41 +0000
committerPeter Eisentraut <peter_e@gmx.net>2001-09-11 23:20:41 +0000
commit32783148471b95edb99031bc02c2dcc7cad66b11 (patch)
tree5a410bcde8fe91434956118de3ba5da910db058b /src
parent93a9cc8533a197af0d20ef1efbfb52c7efc1c628 (diff)
downloadpostgresql-32783148471b95edb99031bc02c2dcc7cad66b11.tar.gz
postgresql-32783148471b95edb99031bc02c2dcc7cad66b11.zip
Use gcc -shared rather than gcc -G for shared library linking on Solaris.
suggested by Bob Deblier (bob@virtualunlimited.com)
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.shlib17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 186575814d2..0635049d064 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.52 2001/06/20 20:25:11 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.53 2001/09/11 23:20:41 petere Exp $
#
#-------------------------------------------------------------------------
@@ -174,13 +174,24 @@ endif
ifeq ($(PORTNAME), solaris)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- LINK.shared = $(COMPILER) -G
+ ifndef cplusplus
+ ifeq ($(GCC), yes)
+ LINK.shared = $(CC) -shared
+ else
+ LINK.shared = $(CC) -G
+ endif
+ else
+ ifeq ($(GXX), yes)
+ LINK.shared = $(CXX) -shared
+ else
+ LINK.shared = $(CXX) -G
+ endif
+ endif
ifeq ($(with_gnu_ld), yes)
LINK.shared += -Wl,-soname,$(soname)
else
LINK.shared += -Wl,-h,$(soname)
endif
- SHLIB_LINK += -lm -lc
endif
ifeq ($(PORTNAME), sunos4)