diff options
| author | Andy Polyakov <appro@openssl.org> | 2004-05-27 22:23:40 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2004-05-27 22:23:40 +0000 |
| commit | 2bbc970e1088986e1f20772e8a0e8d9b3001b58e (patch) | |
| tree | 338da0897030815da134b5a9f3a9a5a50c6e4c5e /Makefile.shared | |
| parent | da8348e93850bad67dbf1cf0430bf8ffbcadb76a (diff) | |
| download | openssl-2bbc970e1088986e1f20772e8a0e8d9b3001b58e.zip openssl-2bbc970e1088986e1f20772e8a0e8d9b3001b58e.tar.gz openssl-2bbc970e1088986e1f20772e8a0e8d9b3001b58e.tar.bz2 | |
Attempt to unify hpux-shared rules. More adjustments might be required
after more tests...
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.shared b/Makefile.shared index d0ff69c..f817d12 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -597,27 +597,29 @@ link_o.hpux32: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='-Fl'; \ + LIBDEPS="$(LIBDEPS)"; \ + ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ + expr $(PLATFORM) : '.*64' > /dev/null && ALLSYMFLAGS='-Wl,+forceload'; \ + SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ + SHAREDCMD=$(CC); \ $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX link_a.hpux32: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='-Fl'; \ + LIBDEPS="$(LIBDEPS)"; \ + ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ + expr $(PLATFORM) : '.*64' > /dev/null && ALLSYMFLAGS='-Wl,+forceload'; \ + SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ + SHAREDCMD='$(CC)'; \ $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX link_app.hpux32: LDCMD=$(CC);\ LDFLAGS="-Wl,+b,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" + LIBDEPS="$(LIBDEPS)"; \ + APPNAME="$(APPNAME)"; \ $(LINK_APP) # HP-UX includes the full pathname of libs we depend on, so we would get |