projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d742dd
)
mk1mk.pl: cleanup engines' handling and make fips build work on WIN64I.
author
Andy Polyakov
<appro@openssl.org>
Fri, 21 Oct 2011 19:34:48 +0000
(19:34 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Fri, 21 Oct 2011 19:34:48 +0000
(19:34 +0000)
util/mk1mf.pl
patch
|
blob
|
history
diff --git
a/util/mk1mf.pl
b/util/mk1mf.pl
index e27e81b61000b4a0c035b1cb8f9f8e7054ff7378..af039c78ac0e558d26e76f9443b1b51bd2d30c9e 100755
(executable)
--- a/
util/mk1mf.pl
+++ b/
util/mk1mf.pl
@@
-906,9
+906,9
@@
$defs.=&do_defs("E_SHLIB",$engines . $otherlibs,"\$(ENG_D)",$shlibp);
foreach (split(/\s+/,$engines))
{
my $engine = $_;
foreach (split(/\s+/,$engines))
{
my $engine = $_;
- my @objs = grep
(/$engine/,@engines_obj)
;
+ my @objs = grep
{/e_$engine/} @engines_obj
;
$rules.=&do_compile_rule("\$(OBJ_D)",join(" ",@objs),$lib);
$rules.=&do_compile_rule("\$(OBJ_D)",join(" ",@objs),$lib);
- map {$_=~s/
[^\/]*\/*([^\/]+)/\$(OBJ_D)${o}$1.
obj/} @objs;
+ map {$_=~s/
.*\/([^\/]+)$/\$(OBJ_D)${o}$1$
obj/} @objs;
$rules.= &do_lib_rule(join(" ",@objs),"\$(ENG_D)$o$engine$shlibp","",$shlib,"");
}
$rules.= &do_lib_rule(join(" ",@objs),"\$(ENG_D)$o$engine$shlibp","",$shlib,"");
}
@@
-1223,7
+1223,9
@@
sub Sasm_compile_target
$bname =~ s/(.*)\.[^\.]$/$1/;
$ret ="\$(TMP_D)$o$bname.asm: $source\n";
$bname =~ s/(.*)\.[^\.]$/$1/;
$ret ="\$(TMP_D)$o$bname.asm: $source\n";
- $ret.="\t\$(CC) -E \$(CFLAG) $source >\$\@\n\n";
+ $ret.="\t\$(CC) -E \$(CFLAG) $source >\$\@\n";
+ $ret.="\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisteronly;
+ $ret.="\n";
$ret.="$target: \$(TMP_D)$o$bname.asm\n";
$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
return($ret);
$ret.="$target: \$(TMP_D)$o$bname.asm\n";
$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
return($ret);