From 51d641c8895b0c658bb3e1e5455dbd24759cdae8 Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Wed, 17 Oct 2018 16:07:29 +0200
Subject: Use NASM for all Windows builds (including cygwin).

---
 crypto/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index f034e9e5..d550b491 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -8,7 +8,7 @@ if(NOT OPENSSL_NO_ASM)
     set(PERLASM_STYLE macosx)
     set(ASM_EXT S)
     enable_language(ASM)
-  elseif(UNIX)
+  elseif(UNIX AND NOT CYGWIN)
     if (${ARCH} STREQUAL "aarch64")
       # The "armx" Perl scripts look for "64" in the style argument
       # in order to decide whether to generate 32- or 64-bit asm.
@@ -25,7 +25,7 @@ if(NOT OPENSSL_NO_ASM)
     enable_language(ASM)
     set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")
   else()
-    if (CMAKE_CL_64)
+    if (CMAKE_CL_64 OR (CYGWIN AND ${ARCH} STREQUAL "x86_64"))
       message("Using nasm")
       set(PERLASM_STYLE nasm)
     else()
-- 
cgit v1.2.3