projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Solaris link_a and link_o
[openssl.git]
/
Makefile.shared
diff --git
a/Makefile.shared
b/Makefile.shared
index 69846a9534bafa2f19d2a8f63a37ed803bdeef5a..159e9ecc0eab62c5129f20b64856e9cb4e09a212 100644
(file)
--- a/
Makefile.shared
+++ b/
Makefile.shared
@@
-380,12
+380,10
@@
link_o.solaris:
$(DO_GNU_SO); \
else \
$(CALC_VERSIONS); \
$(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=; \
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)
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); \
$(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 \
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; \
else \
$(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
- ALLSYMSFLAGS="
$${MINUSZ}
allextract,-M,$(LIBNAME).map"; \
+ ALLSYMSFLAGS="
-Wl,-z,
allextract,-M,$(LIBNAME).map"; \
fi; \
fi; \
- NOALLSYMSFLAGS="
$${MINUSZ}
defaultextract"; \
+ NOALLSYMSFLAGS="
-Wl,-z,
defaultextract"; \
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
fi; \
$(LINK_SO_A)
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
fi; \
$(LINK_SO_A)