Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3278314

Browse files
committed
Use gcc -shared rather than gcc -G for shared library linking on Solaris.
suggested by Bob Deblier (bob@virtualunlimited.com)
1 parent 93a9cc8 commit 3278314

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/Makefile.shlib

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.52 2001/06/20 20:25:11 petere Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.53 2001/09/11 23:20:41 petere Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -174,13 +174,24 @@ endif
174174

175175
ifeq ($(PORTNAME), solaris)
176176
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
177-
LINK.shared = $(COMPILER) -G
177+
ifndef cplusplus
178+
ifeq ($(GCC), yes)
179+
LINK.shared = $(CC) -shared
180+
else
181+
LINK.shared = $(CC) -G
182+
endif
183+
else
184+
ifeq ($(GXX), yes)
185+
LINK.shared = $(CXX) -shared
186+
else
187+
LINK.shared = $(CXX) -G
188+
endif
189+
endif
178190
ifeq ($(with_gnu_ld), yes)
179191
LINK.shared += -Wl,-soname,$(soname)
180192
else
181193
LINK.shared += -Wl,-h,$(soname)
182194
endif
183-
SHLIB_LINK += -lm -lc
184195
endif
185196

186197
ifeq ($(PORTNAME), sunos4)

0 commit comments

Comments
 (0)