diff options
| -rw-r--r-- | Makefile.shared | 14 |
1 files changed, 5 insertions, 9 deletions
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) |