From 4552ddd5357cf38e6fd6ff11c223e931c1f04f6b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 11 Nov 2001 19:20:53 +0000
Subject: [PATCH] Fix for compiling libpq++ on Solaris with Sun SPRO6U2.
Denis A Ustimenko
---
src/Makefile.shlib | 4 ++--
src/makefiles/Makefile.solaris | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 34f805ed98b..2496ad99147 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 4425bc45b35..3bc4f5a914f 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
--
GitLab