diff options
| author | Matt Caswell <matt@openssl.org> | 2015-12-16 11:17:17 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-05 09:03:41 +0000 |
| commit | 2baf8033ab0213f1806af923fb08206503b2abf6 (patch) | |
| tree | 90e00ccf95a28dd632da8c85eb34f970b539fbda /Makefile.shared | |
| parent | 141c6095f22c0d0bc957727eccfa83356f32e090 (diff) | |
| download | openssl-2baf8033ab0213f1806af923fb08206503b2abf6.tar.gz | |
Don't export local symbols on Solaris
Following on from earlier commits to prevent local symbols from being
exported in the shared libraries on Linux, this makes the equivalent changes
for Solaris.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.shared b/Makefile.shared index 0ff1a76534..70980ade08 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -171,7 +171,7 @@ link_app.gnu: @ $(DO_GNU_APP); $(LINK_APP) link_a.linux-shared: - @if [ $(LIBNAME) != "crypto" -a $(LIBNAME) != "ssl" ]; then echo libname is $(LIBNAME); sleep 2; $(DO_GNU_SO); else \ + @if [ $(LIBNAME) != "crypto" -a $(LIBNAME) != "ssl" ]; then $(DO_GNU_SO); else \ $(PERL) util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ @@ -384,7 +384,12 @@ link_a.solaris: ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=;\ - ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + if [ $(LIBNAME) != "crypto" -a $(LIBNAME) != "ssl" ]; then \ + ALLSYMSFLAGS="$${MINUSZ}allextract"; \ + else \ + $(PERL) util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \ + ALLSYMSFLAGS="$${MINUSZ}allextract,-M,$(LIBNAME).map"; \ + fi; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ fi; \ |