VC-32.pl: fix /Fd name generation.

[openssl.git] / util / pl / VC-32.pl

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ac1959acb361fbfefc5f273dd4a8906a2b331247..61a16bb09bcf429e944af7c136f1cb2265b9719c 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -13,6 +13,10 @@ $rm='del /Q';
 
 $zlib_lib="zlib1.lib";
 
+# Santize -L options for ms link
+$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
+$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+
 # C compiler stuff
 $cc='cl';
 if ($FLAVOR =~ /WIN64/)
@@ -118,21 +122,26 @@ else      # Win32
     }
 $mlflags='';
 
-$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
-$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
+$out_def ="out32";     $out_def.="dll"                 if ($shlib);
+                       $out_def.='_$(TARGETCPU)'       if ($FLAVOR =~ /CE/);
+$tmp_def ="tmp32";     $tmp_def.="dll"                 if ($shlib);
+                       $tmp_def.='_$(TARGETCPU)'       if ($FLAVOR =~ /CE/);
 $inc_def="inc32";
 
 if ($debug)
        {
        $cflags=$dbg_cflags.$base_cflags;
-       $lflags.=" /debug";
-       $mlflags.=' /debug';
        }
 else
        {
        $cflags=$opt_cflags.$base_cflags;
        }
 
+# generate symbols.pdb unconditionally
+$app_cflag.=" /Zi /Fd\$(TMP_D)/app";
+$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
+$lflags.=" /debug";
+
 $obj='.obj';
 $asm_suffix='.asm';
 $ofile="/Fo";
@@ -172,18 +181,15 @@ $lfile='/out:';
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
 if ($FLAVOR =~ /WIN64A/) {
-       if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
-               $asm='nasm -f win64 -DNEAR -Ox';
-               $asm.=' -g' if $debug;
+       if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
+               $asm='nasm -f win64 -DNEAR -Ox -g';
                $afile='-o ';
        } else {
-               $asm='ml64 /c /Cp /Cx';
-               $asm.=" /Zi" if $debug;
+               $asm='ml64 /c /Cp /Cx /Zi';
                $afile='/Fo';
        }
 } elsif ($FLAVOR =~ /WIN64I/) {
-       $asm='ias';
-       $asm.=" -d debug" if $debug;
+       $asm='ias -d debug';
        $afile="-o ";
 } elsif ($nasm) {
        my $ver=`nasm -v 2>NUL`;
@@ -193,8 +199,7 @@ if ($FLAVOR =~ /WIN64A/) {
        $asmtype="win32n";
        $afile='-o ';
 } else {
-       $asm='ml /nologo /Cp /coff /c /Cx';
-       $asm.=" /Zi" if $debug;
+       $asm='ml /nologo /Cp /coff /c /Cx /Zi';
        $afile='/Fo';
        $asmtype="win32";
 }
@@ -226,9 +231,7 @@ if (!$no_asm)
 if ($shlib && $FLAVOR !~ /CE/)
        {
        $mlflags.=" $lflags /dll";
-       $lib_cflag=" -D_WINDLL";
-       $out_def="out32dll";
-       $tmp_def="tmp32dll";
+       $lib_cflag.=" -D_WINDLL";
        #
        # Engage Applink...
        #
@@ -258,13 +261,9 @@ elsif ($shlib && $FLAVOR =~ /CE/)
        {
        $mlflags.=" $lflags /dll";
        $lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
-       $lib_cflag=" -D_WINDLL -D_DLL";
-       $out_def='out32dll_$(TARGETCPU)';
-       $tmp_def='tmp32dll_$(TARGETCPU)';
+       $lib_cflag.=" -D_WINDLL -D_DLL";
        }
 
-$cflags.=" /Fd$out_def";
-
 sub do_lib_rule
        {
        local($objs,$target,$name,$shlib)=@_;