diff options
author | Andy Polyakov <appro@openssl.org> | 2005-02-01 23:48:37 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2005-02-01 23:48:37 +0000 |
commit | 62d27939c2f103654b52a83b17febe968a67ec73 (patch) | |
tree | e6be6a7d5bdb754d840776066d28d8a98154c316 /apps/Makefile.ssl | |
parent | 8c3c570134336e915b2b6aeb2203f034f5a29a01 (diff) |
Address run-time linker problems: LD_PRELOAD issue on multi-ABI platforms
and SafeDllSearchMode in Windows.
Submitted by: Richard Levitte
Diffstat (limited to 'apps/Makefile.ssl')
-rw-r--r-- | apps/Makefile.ssl | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index dc5b3d7754..5f7ec2e500 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -171,20 +171,9 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} + @for i in `ls ../*.dll 2>/dev/null`; do cp -p $$i .; done; exit 0 -(cd ..; \ - OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \ - if [ -n "$(SHARED_LIBS)" ]; then \ - LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ - DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ - SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ - LIBPATH="`pwd`:$$LIBPATH"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then \ - PATH="`pwd`:$$PATH"; \ - fi; \ - LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - export LD_PRELOAD; \ - fi; \ + OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \ $(PERL) tools/c_rehash certs) progs.h: progs.pl |