diff options
| author | Ben Laurie <ben@links.org> | 2013-03-04 20:26:17 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-03-04 20:26:17 +0000 |
| commit | 35ced1f705d65d6637a674f2726bccf69aeb574f (patch) | |
| tree | 7d0999e358135cdfee55569287f916e72ebcc2d1 /util/mk1mf.pl | |
| parent | 654d227a86618dea258a3a8cfa23866f2f410148 (diff) | |
| parent | 71a16946dc8d7ecbde150ebf738d7596d1fa80ed (diff) | |
| download | openssl-35ced1f705d65d6637a674f2726bccf69aeb574f.tar.gz | |
Merge branch 'master' of openssl.net:openssl
Conflicts:
util/mk1mf.pl
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index e0e8d57243..f12f9ea3fa 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -875,16 +875,18 @@ 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'); -# 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'); -$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'); + # 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'); + $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) { |