[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  7a6ce9039cb6690aae3cca01f18daab16b8e30d7 (commit)
      from  c7454e1af74b1b99f3f47f782a6ac484c4c55b7f (commit)


- Log -----------------------------------------------------------------
commit 7a6ce9039cb6690aae3cca01f18daab16b8e30d7
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Jan 19 08:24:29 2018 +0100

    Set OPENSSL_ENGINES for Windows
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5108)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/windows-makefile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 66529a2..aee8e88 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -220,6 +220,7 @@ test: tests
 	set BLDTOP=$(BLDDIR)
 	set RESULT_D=$(BLDDIR)\test\test-runs
 	set PERL=$(PERL)
+	set OPENSSL_ENGINES=$(MAKEDIR)\engines
 	set OPENSSL_DEBUG_MEMORY=on
 	"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
 	@rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}