From: Richard Levitte <levitte@openssl.org>
Date: Fri, 5 Apr 2019 13:38:09 +0000 (+0200)
Subject: Configurations/10-main.conf: Don't inherit assembler in Cygwin-common
X-Git-Tag: openssl-3.0.0-alpha1~2206
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=68ca1737ce58173001f2146b913388f872842f69

Configurations/10-main.conf: Don't inherit assembler in Cygwin-common

The targets Cygwin-x86 and Cygwin-x86_64 are the ones that should do
this.

Fixes #8684

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8685)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 0e3afd34d7..27e587fb35 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1431,7 +1431,7 @@ my %targets = (
 
 #### Cygwin
     "Cygwin-common" => {
-        inherit_from     => [ "BASE_unix", asm("x86_asm") ],
+        inherit_from     => [ "BASE_unix" ],
         template         => 1,
 
         CC               => "gcc",