From 105861186f7994d6be38efd4c59ed70cb31f703f Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 4 Feb 2010 01:10:24 +0000 Subject: [PATCH] Only use bufferoverflowu.lib when needed --- util/pl/VC-32.pl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 09dc26f107..ed4a3f92f5 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -149,6 +149,18 @@ if ($no_sock) { $ex_libs=''; } elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.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/) { $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib'; @@ -157,7 +169,7 @@ if ($FLAVOR =~ /CE/) else { $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 "") { - $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); + $ex.= $oflow; if ($target =~ /capi/) { $ex.=' crypt32.lib advapi32.lib'; @@ -358,7 +370,7 @@ sub do_lib_rule $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; $ex.=' crypt32.lib'; - $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); + $ex.= $oflow; } $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; -- 2.25.1