summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2007-08-27 20:02:23 +0000
committerAndy Polyakov <appro@openssl.org>2007-08-27 20:02:23 +0000
commitb27278d0cfab4809f3c3e8c95d2e2344e4b96f57 (patch)
treee4dceccbea726b3feb310e04fe5616001e457a0d
parent24a69a81966715de3bd6c899c68433fd613b491f (diff)
Last change inadvertently disabled x86[_64] assembler in Windows build.
-rwxr-xr-xConfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/Configure b/Configure
index 6542996334..6717105ecb 100755
--- a/Configure
+++ b/Configure
@@ -936,7 +936,9 @@ my $arflags = $fields[$idx_arflags];
if ($fips)
{
delete $disabled{"shared"} if ($disabled{"shared"} eq "default");
- $disabled{"asm"}="forced" if ("$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::");
+ $disabled{"asm"}="forced"
+ if ($target !~ "VC\-.*" &&
+ "$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::");
}