From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 11 Nov 2001 19:20:53 +0000 (+0000)
Subject: Fix for compiling libpq++ on Solaris with Sun SPRO6U2.
X-Git-Tag: REL9_0_0~19137
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4552ddd5357cf38e6fd6ff11c223e931c1f04f6b;p=pg-rex%2Fsyncrep.git

Fix for compiling libpq++ on Solaris with Sun SPRO6U2.

Denis A Ustimenko
---

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 34f805ed98..2496ad9914 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.55 2001/10/05 21:15:38 petere Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.56 2001/11/11 19:20:53 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -190,7 +190,7 @@ ifeq ($(PORTNAME), solaris)
   ifeq ($(with_gnu_ld), yes)
     LINK.shared		+= -Wl,-soname,$(soname)
   else
-    LINK.shared		+= -Wl,-h,$(soname)
+    LINK.shared		+= -h $(soname)
   endif
 endif
 
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 4425bc45b3..3bc4f5a914 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.7 2001/08/29 19:14:40 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.8 2001/11/11 19:20:53 momjian Exp $
 
 AROPT = crs
 
@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
 export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(libdir)
 else
-rpath = -Wl,-R$(libdir)
+rpath = -R$(libdir)
 endif
 shlib_symbolic = -Wl,-Bsymbolic