From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 13 Aug 2007 02:24:26 +0000 (+0000)
Subject: Fix for asm/no-asm on WIN32.
X-Git-Tag: OpenSSL_0_9_8k^2~745
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=167066fed4700d68b2776cbece464658fb30ac92;p=oweals%2Fopenssl.git

Fix for asm/no-asm on WIN32.
---

diff --git a/crypto/Makefile b/crypto/Makefile
index e5b5b0781b..af2cac96d4 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -26,6 +26,7 @@ EX_LIBS=
 CFLAGS= $(INCLUDE) $(CFLAG)
 ASFLAGS= $(INCLUDE) $(ASFLAG)
 AFLAGS=$(ASFLAGS)
+CPUID_OBJ=mem_clr.o
 
 LIBS=
 
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 15579363fc..b5e13c3575 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -677,7 +677,7 @@ foreach (values %lib_nam)
 		}
 	if (($cpuid_asm_obj ne "") && ($_ eq "CRYPTO"))
 		{
-		$lib_obj =~ s/\s(\S*\/cversion\S*)/ $1 \$(CPUID_ASM_OBJ)/;
+		$lib_obj =~ s/\s\S*\/mem_clr\S*/ \$(CPUID_ASM_OBJ)/;
 		$rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);
 		}
 	$defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);