diff options
Diffstat (limited to 'external/openssl/ExternalProject_openssl.mk')
-rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 9febccfc0316..cadbb9b01bc9 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -42,7 +42,9 @@ OPENSSL_PLATFORM := \ ios-armv7\ ,\ $(if $(filter WNT,$(OS)),\ - $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\ + $(if $(filter INTEL,$(CPUNAME)),VC-WIN32)\ + $(if $(filter X86_64,$(CPUNAME)),VC-WIN64A)\ + $(if $(filter ARM64,$(CPUNAME)),VC-WIN64-ARM)\ ,\ $(if $(filter MACOSX,$(OS)),\ $(if $(filter POWERPC,$(CPUNAME)),darwin-ppc-cc)\ @@ -60,11 +62,9 @@ $(eval $(call gb_ExternalProject_use_nmake,openssl,build)) $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export PERL="$(shell cygpath -w $(PERL))" \ - && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ - && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ - && nmake -f "ms\ntdll.mak" \ - && mv inc32/* include/ \ + CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM) no-tests no-multilib \ + && export PERL="$(shell cygpath -w $(PERL))" \ + && nmake -f makefile \ ) else @@ -76,8 +76,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(filter WNT,$(OS)), \ $(PERL) Configure, \ ./config)) \ - $(OPENSSL_PLATFORM) no-dso no-shared \ - $(if $(filter-out WNT,$(OS)),no-idea) \ + $(OPENSSL_PLATFORM) no-dso no-shared no-tests no-multilib threads \ $(if $(filter-out ANDROID iOS WNT,$(OS)), \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ |