From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 4 Mar 2013 19:14:57 +0000 (+0000)
Subject: Fix WIN32 build.
X-Git-Tag: master-post-reformat~1399^2
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=71a16946dc8d7ecbde150ebf738d7596d1fa80ed;hp=5702e965d759dde8a098d8108660721ba2b93a7d

Fix WIN32 build.

Make assembly language handling conditional on the "copy" platform
as Windows does its own thing here.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2b1e915265..dfe28964e1 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -875,15 +875,17 @@ sub fix_asm
 	return $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');
-# 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');
-$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
-$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
-$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
+if ($orig_platform eq 'copy') {
+	$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');
+	# 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');
+	$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
+	$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
+	$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
+}
 
 foreach (values %lib_nam)
 	{