diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-11-05 09:12:10 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-11-05 09:12:10 +0000 |
| commit | 8de69cf2c657b488ef7801ca80f9fd3eb7320759 (patch) | |
| tree | d8c3e3cf0a64ee463f8a9d303e8606be76cfa67c /Makefile.org | |
| parent | a2ac429da2f90616d1465dac704eb1e91d2be722 (diff) | |
Make sure LD_PRELOAD is only set when we build shared libraries (and
therefore link with them). Add LD_PRELOAD setting code where it was
still missing.
PR: 966
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.org b/Makefile.org index 65ee439bff..a381960801 100644 --- a/Makefile.org +++ b/Makefile.org @@ -410,6 +410,10 @@ rehash.time: certs LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + if [ -n "$(SHARED_LIBS)" ]; then \ + LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ + export LD_PRELOAD; \ + fi; \ $(PERL) tools/c_rehash certs) touch rehash.time @@ -424,6 +428,10 @@ tests: rehash LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + if [ -n "$(SHARED_LIBS)" ]; then \ + LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ + export LD_PRELOAD; \ + fi; \ apps/openssl version -a report: |