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

Build system: VC-WIN64I fixups.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov
2016-03-23 20:33:29 +01:00
parent c5c7700c9a
commit 6ddb62a575
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Configurations/10-main.conf
View File

@@ -1274,8 +1274,10 @@ sub vc_wince_info {
asflags => "-d debug", asflags => "-d debug",
asoutflag => "-o", asoutflag => "-o",
sys_id => "WIN64I", sys_id => "WIN64I",
bn_asm_src => sub { my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, bn_asm_src => sub { return undef unless @_;
my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; },
perlasm_scheme => "ias", perlasm_scheme => "ias",
multilib => "-ia64",
}, },
"VC-WIN64A" => { "VC-WIN64A" => {
inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"),
@@ -1287,6 +1289,7 @@ sub vc_wince_info {
bn_asm_src => sub { return undef unless @_; bn_asm_src => sub { return undef unless @_;
my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; },
perlasm_scheme => "auto", perlasm_scheme => "auto",
multilib => "-x64",
}, },
"VC-WIN32" => { "VC-WIN32" => {
# x86 Win32 target defaults to ANSI API, if you want UNICODE, # x86 Win32 target defaults to ANSI API, if you want UNICODE,

13
Configurations/windows-makefile.tmpl
View File

@@ -154,7 +154,8 @@ install: install_sw install_ssldirs install_docs
uninstall: uninstall_docs uninstall_sw uninstall: uninstall_docs uninstall_sw
libclean: libclean:
del /Q /F $(LIBS) $(SHLIBS) $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS)
del /Q /F $(LIBS)
del lib.pdb del lib.pdb
clean: libclean clean: libclean
@@ -227,7 +228,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
@echo "*** Please run the same make command again ***" @echo "*** Please run the same make command again ***"
@echo "*** ***" @echo "*** ***"
@echo "**************************************************" @echo "**************************************************"
@( exit 1 ) @exit 1
{- {-
use File::Basename; use File::Basename;
@@ -294,12 +295,8 @@ EOF
sub src2obj { sub src2obj {
my %args = @_; my %args = @_;
my $obj = $args{obj}; my $obj = $args{obj};
my @srcs = map { if ($unified_info{generate}->{$_}) { my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
(my $x = $_) =~ s/\.[sS]$/.asm/; $x } ( @{$args{srcs}} );
} else {
$_
}
} ( @{$args{srcs}} );
my $srcs = join(" ", @srcs); my $srcs = join(" ", @srcs);
my $deps = join(" ", @srcs, @{$args{deps}}); my $deps = join(" ", @srcs, @{$args{deps}});
my $incs = join("", map { " /I ".$_ } @{$args{incs}}); my $incs = join("", map { " /I ".$_ } @{$args{incs}});

4
build.info
View File

@@ -13,8 +13,8 @@ ELSIF[{- $config{target} =~ /^mingw/ -}]
SHARED_NAME[libcrypto]=libcrypto-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} eq "mingw64" ? "-x64" : "" -} SHARED_NAME[libcrypto]=libcrypto-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} eq "mingw64" ? "-x64" : "" -}
SHARED_NAME[libssl]=libssl-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} eq "mingw64" ? "-x64" : "" -} SHARED_NAME[libssl]=libssl-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} eq "mingw64" ? "-x64" : "" -}
ELSIF[{- $config{target} =~ /^VC-/ -}] ELSIF[{- $config{target} =~ /^VC-/ -}]
SHARED_NAME[libcrypto]=libcrypto-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} =~ /^VC-WIN64/ ? "-x64" : "" -} SHARED_NAME[libcrypto]=libcrypto-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $target{multilib} -}
SHARED_NAME[libssl]=libssl-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} =~ /^VC-WIN64/ ? "-x64" : "" -} SHARED_NAME[libssl]=libssl-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $target{multilib} -}
ENDIF ENDIF
# VMS has a cultural standard where all libraries are prefixed. # VMS has a cultural standard where all libraries are prefixed.