diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-16 14:48:36 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-16 15:54:47 +0100 |
| commit | 4ad386412c03c5c878d0625dedff1c4eb45cd02b (patch) | |
| tree | 1ccb39fcb8b490e1c465d7e15789b3bf2b33cace /Makefile.shared | |
| parent | Simplify tls1_set_ec_id. (diff) | |
| download | openssl-4ad386412c03c5c878d0625dedff1c4eb45cd02b.tar.xz openssl-4ad386412c03c5c878d0625dedff1c4eb45cd02b.zip | |
Fix Solaris link_a and link_o
A long time ago, Solaris cc didn't seem to handle -Wl, linker options,
while gcc on Solaris required it. Since then, Solaris cc has
developed to understand -Wl, options, and our little dance to figure
out how to pass linker options to the C compiler that's used isn't
needed any more.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.shared')
| -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) |