summaryrefslogtreecommitdiffstats
path: root/Configurations/10-main.conf
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-04-05 15:38:09 +0200
committerRichard Levitte <levitte@openssl.org>2019-04-09 11:19:26 +0200
commit68ca1737ce58173001f2146b913388f872842f69 (patch)
treec34e7c971bd9728146cda966791de4ba399ce31a /Configurations/10-main.conf
parent195852fefc1ef090977ed3cc3334f1dfbd6bac34 (diff)
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)
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r--Configurations/10-main.conf2
1 files changed, 1 insertions, 1 deletions
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",