[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - external/openssl

[Michael Stahl (via logerrit)]

 external/openssl/ExternalProject_openssl.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1a97d13913ecc3d2a755803e540d7641a7fd112
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Apr 8 14:25:47 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Apr 8 14:29:23 2019 +0200

    openssl: try to fix build with 7.1A SDK
    
    Change-Id: Ic4a9e53227e34fe41a69afd52a9e91ef9545f8f9

diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index 9ae7a1395cc6..7b7b960a4b18 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
 	$(call gb_ExternalProject_run,build,\
-		export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
+		export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC)) $(if $(findstring 140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_)" \
 		&& export PERL="$(shell cygpath -w $(PERL))" \
 		&& export LIB="$(ILIB)" \
 		&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \