Check for OPENSSL_USE_APPLINK in $config{cflags} as well
authorRichard Levitte <levitte@openssl.org>
Tue, 16 Feb 2016 15:49:29 +0000 (16:49 +0100)
committerRichard Levitte <levitte@openssl.org>
Tue, 16 Feb 2016 15:49:29 +0000 (16:49 +0100)
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>
Configure

index c2df734..0cf893e 100755 (executable)
--- 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}));