summaryrefslogtreecommitdiff
path: root/Makefile.shared
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-04-04 17:10:53 +0000
committerAndy Polyakov <appro@openssl.org>2005-04-04 17:10:53 +0000
commit0abfd606049999071891ef2bab460c99d254edc6 (patch)
treeb5a1d96808941760cfb4ae9e16ece21240ef740c /Makefile.shared
parente5dbccc182f3ada92014f2569ed9624886040ce0 (diff)
downloadopenssl-new-0abfd606049999071891ef2bab460c99d254edc6.tar.gz
Extend Solaris x86 support to amd64.
Diffstat (limited to 'Makefile.shared')
-rw-r--r--Makefile.shared6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.shared b/Makefile.shared
index d4df5e2b66..6c6a96d58f 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -141,7 +141,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
LIBDEPS="$(LIBDEPS)"; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
SHAREDCMD='$(CC)'
DO_GNU_APP=LDCMD=$(CC);\
LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
@@ -457,7 +457,7 @@ link_o.solaris:
LIBDEPS="$(LIBDEPS)"; \
ALLSYMSFLAGS="$${MINUSZ}allextract"; \
NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
- SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
SHAREDCMD='$(CC)'; \
fi; \
$(LINK_SO_O)
@@ -473,7 +473,7 @@ link_a.solaris:
LIBDEPS="$(LIBDEPS)"; \
ALLSYMSFLAGS="$${MINUSZ}allextract"; \
NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
- SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
SHAREDCMD='$(CC)'; \
fi; \
$(LINK_SO_A)