From: Andy Polyakov <appro@openssl.org>
Date: Mon, 16 Dec 2002 18:59:05 +0000 (+0000)
Subject: Some of Sun compiler drivers (well, one of those I have) collect all
X-Git-Tag: OpenSSL_0_9_7-beta6~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9f3864fde3c9d5631e7cd31c5427779c962c0b23;p=oweals%2Fopenssl.git

Some of Sun compiler drivers (well, one of those I have) collect all
options specified with -Wl in the beginnig of the ld command line which
kind of obsoletes the idea as it's -z defaultextract that will be
closest to lib*.a and not -z allextract:-(
---

diff --git a/Makefile.org b/Makefile.org
index d110cc8297..cd66a01249 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -357,10 +357,12 @@ do_solaris-shared:
 	else \
 		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
+		  MINUSZ='-z '; \
+		  (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		  set -x; ${CC} ${SHARED_LDFLAGS} -G -dy -z text \
 			-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-			-Wl,-z,allextract lib$$i.a -Wl,-z,defaultextract \
+			$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
 			$$libs ${EX_LIBS} -lc ) || exit 1; \
 		libs="$$libs -l$$i"; \
 		done; \