generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link _chkstk.o from FIPSLIB_D.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-04-07 00:04:37 +00:00
parent dd4263d906
commit 6c9cd652f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/pl/VC-32.pl
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.=" ms${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.=" ms${o}_chkstk.o"; $ex.=" \$(FIPSLIB_D)ms${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";
@ -178,7 +178,7 @@ sub do_link_rule
if ($standalone) if ($standalone)
{ {
$ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
$ret.="ms/_chkstk.o " if ($files =~ /O_FIPSCANISTER/); $ret.="\$(FIPSLIB_D)${o}_chkstk.o " if ($files =~ /O_FIPSCANISTER/);
$ret.="$files $libs\n<<\n"; $ret.="$files $libs\n<<\n";
} }
elsif ($fips && !$shlib) elsif ($fips && !$shlib)