]> granicus.if.org Git - openssl/commitdiff
Link _chkstk.o from FIPSLIB_D.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 7 Apr 2006 00:04:37 +0000 (00:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 7 Apr 2006 00:04:37 +0000 (00:04 +0000)
util/pl/VC-32.pl

index 5bc50e2485c99dae44c1a0efe714edea7bce2cb5..e699918f52a3fdec228eb78c030cd137d1933ee4 100644 (file)
@@ -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)