This commit is contained in:
Dr. Stephen Henson
2006-04-07 00:15:44 +00:00
parent 6c9cd652f7
commit d366bf7948

View File

@@ -135,7 +135,7 @@ sub do_lib_rule
# $ret.="\t\$(RM) \$(O_$Name)\n"; # $ret.="\t\$(RM) \$(O_$Name)\n";
$ret.="$target: $objs\n"; $ret.="$target: $objs\n";
$ex =' advapi32.lib'; $ex =' advapi32.lib';
$ex.=" \$(FIPSLIB_d)${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/; $ex.=" \$(FIPSLIB_D)${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/;
$ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n";
} }
else else
@@ -145,7 +145,7 @@ sub do_lib_rule
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
if ($fips && $target =~ /O_CRYPTO/) if ($fips && $target =~ /O_CRYPTO/)
{ {
$ex.=" \$(FIPSLIB_D)ms${o}_chkstk.o"; $ex.=" \$(FIPSLIB_D)${o}_chkstk.o";
$ret.="$target: $objs \$(PREMAIN_DSO_EXE)\n"; $ret.="$target: $objs \$(PREMAIN_DSO_EXE)\n";
$ret.="\tSET FIPS_LINK=\$(LINK)\n"; $ret.="\tSET FIPS_LINK=\$(LINK)\n";
$ret.="\tSET FIPS_CC=\$(CC)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n";