Address run-time linker problems: LD_PRELOAD issue on multi-ABI platforms

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index dc5b3d77548bf84b04e5435a0cc7afbfd298f06a..5f7ec2e500287976692fbb36712f9672161e0b5d 100644 (file)
--- 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