X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=Makefile.shared;h=159e9ecc0eab62c5129f20b64856e9cb4e09a212;hb=432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff;hp=69846a9534bafa2f19d2a8f63a37ed803bdeef5a;hpb=7b8666276df86c1b84bae410eea2fa1947f6516a;p=openssl.git

diff --git a/Makefile.shared b/Makefile.shared
index 69846a9534..159e9ecc0e 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -380,12 +380,10 @@ link_o.solaris:
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
-		MINUSZ='-z '; \
-		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
-		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
-		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+		ALLSYMSFLAGS="-Wl,-z,allextract"; \
+		NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 	fi; \
 	$(LINK_SO_O)
@@ -394,17 +392,15 @@ link_a.solaris:
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
-		MINUSZ='-z '; \
-		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=;\
 		if [ $(LIBNAME) != "crypto" -a $(LIBNAME) != "ssl" ]; then \
-			ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+			ALLSYMSFLAGS="-Wl,-z,allextract"; \
 		else \
 			$(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
-			ALLSYMSFLAGS="$${MINUSZ}allextract,-M,$(LIBNAME).map"; \
+			ALLSYMSFLAGS="-Wl,-z,allextract,-M,$(LIBNAME).map"; \
 		fi; \
-		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+		NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 	fi; \
 	$(LINK_SO_A)