Fix for asm/no-asm on WIN32.

diff --git a/crypto/Makefile b/crypto/Makefile
index e5b5b0781b1f9f6dc0f5ab4894669fa692a978af..af2cac96d4ca55536c537fc8ba8488935d855aba 100644 (file)
--- 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 15579363fc8baaeb0164fea452b4d96c3c5221ef..b5e13c3575f456e216f413e2c1d9b296797db0ba 100755 (executable)
--- 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);