From 2f297fce734aa1ba38836e1a75f65e0a48bfa0c7 Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@links.org>
Date: Mon, 4 Mar 2013 16:10:47 +0000
Subject: [PATCH] Don't make CPUID stuff twice.

---
 util/mk1mf.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2b1e915265..24ee3120dc 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -877,7 +877,8 @@ sub fix_asm
 
 $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
 $lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
-$lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
+# cpuid is included by the crypto dir
+#$lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
 # AES asm files end up included by the aes dir itself
 #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
 $lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha');
-- 
2.25.1