From: Richard Levitte <levitte@openssl.org>
Date: Mon, 16 Dec 2002 20:33:38 +0000 (+0000)
Subject: Transfer the Solaris shared library building changes from
X-Git-Tag: OpenSSL_0_9_7a~86^2~92
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c445142505ff84fb6d13b0ae12e86cff07a1b06e;p=oweals%2Fopenssl.git

Transfer the Solaris shared library building changes from
0.9.7-stable.
---

diff --git a/Makefile.shared b/Makefile.shared
index 7e56204552..fad2fd15ef 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -333,11 +333,13 @@ link_o.solaris:
 		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
+		MINUSZ='-z '; \
+		(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
 		LIBDEPS="$(LIBDEPS) -lc" \
-		ALLSYMSFLAGS='-z allextract' \
-		NOALLSYMSFLAGS='' \
+		ALLSYMSFLAGS="$${MINUSZ}allextract" \
+		NOALLSYMSFLAGS="$${MINUSZ}defaultextract" \
 		SHAREDFLAGS='-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
 	fi; \
@@ -347,11 +349,13 @@ link_a.solaris:
 		$(DO_GNU); \
 	else \
 		$(CALC_VERSIONS); \
+		MINUSZ='-z '; \
+		(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so \
 		SHLIB_SUFFIX= \
 		LIBDEPS="$(LIBDEPS) -lc" \
-		ALLSYMSFLAGS='-z allextract' \
-		NOALLSYMSFLAGS='' \
+		ALLSYMSFLAGS="$${MINUSZ}allextract" \
+		NOALLSYMSFLAGS="$${MINUSZ}defaultextract" \
 		SHAREDFLAGS='-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
 		SHAREDCMD='$(CC)'; \
 	fi; \