summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-16 16:49:29 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-16 16:49:29 +0100
commit432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff (patch)
treeea9e62fd6d8ce76fa029f1e64da6ac63a66f6ec2 /Configure
parenta583fc45fa91a74b944526448621161640579bc2 (diff)
Check for OPENSSL_USE_APPLINK in $config{cflags} as well
Macro definitions "should" be found in $config{defines}, but some configs haven't transfered macro definitions from their 'cflags' settings (which isn't mandatory anyway), so check both places. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/Configure b/Configure
index c2df73417a..0cf893ee7a 100755
--- a/Configure
+++ b/Configure
@@ -1045,7 +1045,9 @@ if ($target{ranlib} eq "")
if (!$no_asm) {
$target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
- $target{cpuid_asm_src}.=" uplink.c uplink-x86.s" if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}});
+ $target{cpuid_asm_src}.=" uplink.c uplink-x86.s"
+ if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}}
+ || grep /(^|\s)-DOPENSSL_USE_APPLINK(\s|$)/, ${$config{cflags}});
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));