diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-23 20:33:29 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-29 09:48:25 +0200 |
| commit | 6ddb62a575a31940785fdf3db8a24ca6006e5d2a (patch) | |
| tree | e44ad033f4bd63b72175dcf4fb65ff99496afb86 | |
| parent | c5c7700c9a1c1daae33329fab71d3eed5955d5d8 (diff) | |
| download | openssl-6ddb62a575a31940785fdf3db8a24ca6006e5d2a.tar.gz | |
Build system: VC-WIN64I fixups.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | Configurations/10-main.conf | 5 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 13 | ||||
| -rw-r--r-- | build.info | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 0ce9231e67..737ae85e77 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1274,8 +1274,10 @@ sub vc_wince_info { asflags => "-d debug", asoutflag => "-o", 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", + multilib => "-ia64", }, "VC-WIN64A" => { inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), @@ -1287,6 +1289,7 @@ sub vc_wince_info { bn_asm_src => sub { return undef unless @_; my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, perlasm_scheme => "auto", + multilib => "-x64", }, "VC-WIN32" => { # x86 Win32 target defaults to ANSI API, if you want UNICODE, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 0b8ac72d58..00149c3b67 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -154,7 +154,8 @@ install: install_sw install_ssldirs install_docs uninstall: uninstall_docs uninstall_sw libclean: - del /Q /F $(LIBS) $(SHLIBS) + $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS) + del /Q /F $(LIBS) del lib.pdb clean: libclean @@ -227,7 +228,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure @echo "*** Please run the same make command again ***" @echo "*** ***" @echo "**************************************************" - @( exit 1 ) + @exit 1 {- use File::Basename; @@ -294,12 +295,8 @@ EOF sub src2obj { my %args = @_; my $obj = $args{obj}; - my @srcs = map { if ($unified_info{generate}->{$_}) { - (my $x = $_) =~ s/\.[sS]$/.asm/; $x - } else { - $_ - } - } ( @{$args{srcs}} ); + my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x + } ( @{$args{srcs}} ); my $srcs = join(" ", @srcs); my $deps = join(" ", @srcs, @{$args{deps}}); my $incs = join("", map { " /I ".$_ } @{$args{incs}}); diff --git a/build.info b/build.info index 1a201c3785..ab941f8ce4 100644 --- a/build.info +++ b/build.info @@ -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[libssl]=libssl-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} eq "mingw64" ? "-x64" : "" -} ELSIF[{- $config{target} =~ /^VC-/ -}] - SHARED_NAME[libcrypto]=libcrypto-{- $config{shlib_major}."_".$config{shlib_minor} -}{- $config{target} =~ /^VC-WIN64/ ? "-x64" : "" -} - SHARED_NAME[libssl]=libssl-{- $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} -}{- $target{multilib} -} ENDIF # VMS has a cultural standard where all libraries are prefixed. |