The branch master has been updated
via 67949615d25ead969c12e0f39370fef866df1704 (commit)
from 2c52ac9bfefa813bfef864ff35e3d2afb8dbdae9 (commit)
- Log -----------------------------------------------------------------
commit 67949615d25ead969c12e0f39370fef866df1704
Author: Richard Levitte <[email protected]>
Date: Thu Jan 14 12:18:30 2016 +0100
Fall back to c_rehash if 'openssl rehash' fails
'openssl rehash' isn't implemented on all platforms, and since 'make
test' depends on a rehash of certs/demo being performed, it becomes an
effective block from running tests on any platform but Unix, for the
moment.
It's better to fall back to c_rehash and let the tests perform
everywhere.
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index cf575ef..af24a24 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -426,13 +426,14 @@ dclean:
@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
rehash: rehash.time
-rehash.time: certs apps
+rehash.time: certs build_apps
@if [ -z "$(CROSS_COMPILE)" ]; then \
(OPENSSL="`pwd`/util/opensslwrap.sh"; \
[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
- $$OPENSSL rehash certs/demo) && \
+ $$OPENSSL rehash certs/demo \
+ || $(PERL) tools/c_rehash certs/demo) && \
touch rehash.time; \
else :; fi
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
