diff options
| author | Dr. Stephen Henson <[email protected]> | 2006-04-07 02:04:37 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <[email protected]> | 2006-04-07 02:04:37 +0200 |
| commit | 6c9cd652f7867204a29ca6f829d6fdad271e79ef (patch) | |
| tree | ddd0d60d6af5831075140e11f61a5de92c51f259 | |
| parent | Change chop to chomp when reading lines, so CRLF is properly processed on (diff) | |
| download | openssl-6c9cd652f7867204a29ca6f829d6fdad271e79ef.tar.gz openssl-6c9cd652f7867204a29ca6f829d6fdad271e79ef.zip | |
Link _chkstk.o from FIPSLIB_D.
| -rw-r--r-- | util/pl/VC-32.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 5bc50e2485c..e699918f52a 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -135,7 +135,7 @@ sub do_lib_rule # $ret.="\t\$(RM) \$(O_$Name)\n"; $ret.="$target: $objs\n"; $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"; } else @@ -145,7 +145,7 @@ sub do_lib_rule $ex.=" $zlib_lib" if $zlib_opt == 1 && $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.="\tSET FIPS_LINK=\$(LINK)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n"; @@ -178,7 +178,7 @@ sub do_link_rule if ($standalone) { $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"; } elsif ($fips && !$shlib) |