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

Only use bufferoverflowu.lib when needed

Browse Source
This commit is contained in:
Dr. Stephen Henson
2010-02-04 01:10:24 +00:00
parent 4a9d335bb4
commit 105861186f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util/pl/VC-32.pl
View File

@@ -149,6 +149,18 @@ if ($no_sock) { $ex_libs=''; }
elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.lib'; } elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.lib'; }
else { $ex_libs='wsock32.lib'; } else { $ex_libs='wsock32.lib'; }
my $oflow;
if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./)
{
$oflow=' bufferoverflowu.lib';
}
else
{
$oflow="";
}
if ($FLAVOR =~ /CE/) if ($FLAVOR =~ /CE/)
{ {
$ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib'; $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib';
@@ -157,7 +169,7 @@ if ($FLAVOR =~ /CE/)
else else
{ {
$ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib'; $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); $ex_libs.= $oflow;
} }
@@ -343,7 +355,7 @@ sub do_lib_rule
if ($name eq "") if ($name eq "")
{ {
$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); $ex.= $oflow;
if ($target =~ /capi/) if ($target =~ /capi/)
{ {
$ex.=' crypt32.lib advapi32.lib'; $ex.=' crypt32.lib advapi32.lib';
@@ -358,7 +370,7 @@ sub do_lib_rule
$ex.=' unicows.lib' if ($FLAVOR =~ /NT/); $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
$ex.=' crypt32.lib'; $ex.=' crypt32.lib';
$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); $ex.= $oflow;
} }
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;