diff options
author | Andy Polyakov <appro@openssl.org> | 2011-09-18 15:40:11 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2011-09-18 15:40:11 +0000 |
commit | 2b1f17f83fb82607c178123c63237171a9b771cb (patch) | |
tree | 505b96ae530e632c47c29dda999e878557ae9609 /util | |
parent | 7470276a25c1fb09ef37a323f3795061fa9b5f40 (diff) |
Make latest assembler additions (vpaes and e_padlock) work in Windows build.
Diffstat (limited to 'util')
-rwxr-xr-x | util/mk1mf.pl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 4bf4a1aea2..d639fba74a 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -13,6 +13,7 @@ $banner="\t\@echo Building OpenSSL"; my $no_static_engine = 1; my $engines = ""; +my @engines_obj = ""; my $otherlibs = ""; local $zlib_opt = 0; # 0 = no zlib, 1 = static, 2 = dynamic local $zlib_lib = ""; @@ -411,8 +412,13 @@ for (;;) if ($key eq "HEADER") { $header.=&var_add($dir,$val, 1); } - if ($key eq "LIBOBJ" && ($dir ne "engines" || !$no_static_engine)) + if ($key eq "LIBOBJ") + { + if ($dir ne "engines" || !$no_static_engine) { $libobj=&var_add($dir,$val, 0); } + else + { push(@engines_obj,split(/\s+/,&var_add($dir,$val,0))); } + } if ($key eq "LIBNAMES" && $dir eq "engines" && $no_static_engine) { $engines.=$val } @@ -899,8 +905,11 @@ $defs.=&do_defs("E_SHLIB",$engines . $otherlibs,"\$(ENG_D)",$shlibp); foreach (split(/\s+/,$engines)) { - $rules.=&do_compile_rule("\$(OBJ_D)","engines${o}e_$_",$lib); - $rules.= &do_lib_rule("\$(OBJ_D)${o}e_${_}.obj","\$(ENG_D)$o$_$shlibp","",$shlib,""); + my $engine = $_; + my @objs = grep(/$engine/,@engines_obj); + $rules.=&do_compile_rule("\$(OBJ_D)",join(" ",@objs),$lib); + map {$_=~s/[^\/]*\/*([^\/]+)/\$(OBJ_D)${o}$1.obj/} @objs; + $rules.= &do_lib_rule(join(" ",@objs),"\$(ENG_D)$o$engine$shlibp","",$shlib,""); } |