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

ex_libs settings have to be added to, not overriden, on Windows too

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte
2016-04-15 07:53:17 +02:00
parent e951eca8b4
commit ef5b8296a1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Configurations/10-main.conf
View File

@@ -1298,20 +1298,20 @@ sub vms_info {
release => sub { $disabled{shared} ? "/MT" : () }, release => sub { $disabled{shared} ? "/MT" : () },
)), )),
bin_lflags => add("/subsystem:console /opt:ref"), bin_lflags => add("/subsystem:console /opt:ref"),
ex_libs => sub { ex_libs => add(sub {
my @ex_libs = (); my @ex_libs = ();
push @ex_libs, 'ws2_32.lib' unless $disabled{sock}; push @ex_libs, 'ws2_32.lib' unless $disabled{sock};
push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib'; push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib';
return join(" ", @ex_libs); return join(" ", @ex_libs);
}, }),
}, },
"VC-WIN64-common" => { "VC-WIN64-common" => {
inherit_from => [ "VC-noCE-common" ], inherit_from => [ "VC-noCE-common" ],
ex_libs => sub { ex_libs => add(sub {
my @ex_libs = (); my @ex_libs = ();
push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
return join(" ", @_, @ex_libs); return join(" ", @_, @ex_libs);
}, }),
bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
build_scheme => add("VC-W64", { separator => undef }), build_scheme => add("VC-W64", { separator => undef }),
}, },
@@ -1349,14 +1349,14 @@ sub vms_info {
return $ver ge $vew ? "nasm" : "nasmw" }, return $ver ge $vew ? "nasm" : "nasmw" },
asflags => "-f win32", asflags => "-f win32",
asoutflag => "-o", asoutflag => "-o",
ex_libs => sub { ex_libs => add(sub {
my @ex_libs = (); my @ex_libs = ();
# WIN32 UNICODE build gets linked with unicows.lib for # WIN32 UNICODE build gets linked with unicows.lib for
# backward compatibility with Win9x. # backward compatibility with Win9x.
push @ex_libs, 'unicows.lib' push @ex_libs, 'unicows.lib'
if (grep { $_ eq "UNICODE" } @user_defines); if (grep { $_ eq "UNICODE" } @user_defines);
return join(" ", @ex_libs, @_); return join(" ", @ex_libs, @_);
}, }),
sys_id => "WIN32", sys_id => "WIN32",
bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
perlasm_scheme => "win32n", perlasm_scheme => "win32n",
@@ -1387,7 +1387,7 @@ sub vms_info {
? "/entry:mainCRTstartup" : (); }), ? "/entry:mainCRTstartup" : (); }),
sys_id => "WINCE", sys_id => "WINCE",
bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
ex_libs => sub { ex_libs => add(sub {
my @ex_libs = (); my @ex_libs = ();
push @ex_libs, 'ws2.lib' unless $disabled{sock}; push @ex_libs, 'ws2.lib' unless $disabled{sock};
push @ex_libs, 'crypt32.lib'; push @ex_libs, 'crypt32.lib';
@@ -1405,7 +1405,7 @@ sub vms_info {
push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib' push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib'
if ($ENV{'TARGETCPU'} eq "X86"); if ($ENV{'TARGETCPU'} eq "X86");
return @ex_libs; return @ex_libs;
}, }),
build_scheme => add("VC-WCE", { separator => undef }), build_scheme => add("VC-WCE", { separator => undef }),
}, },