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 /Configurations/windows-makefile.tmpl | |
| parent | c5c7700c9a1c1daae33329fab71d3eed5955d5d8 (diff) | |
| download | openssl-6ddb62a575a31940785fdf3db8a24ca6006e5d2a.tar.gz | |
Build system: VC-WIN64I fixups.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 13 |
1 files changed, 5 insertions, 8 deletions
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}}); |