Commit 674d5858 authored by Richard Levitte's avatar Richard Levitte
Browse files

If the asm file to be compiled isn't generated, leave the ext alone 



Closes RT#4447

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 812e0c8d

Configurations/unix-Makefile.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -841,7 +841,12 @@ EOF 
  sub src2obj {

      my %args = @_;

      my $obj = $args{obj};

      my @srcs = map { (my $x = $_) =~ s/\.S$/.s/; $x } ( @{$args{srcs}} );

      my @srcs = map { if ($unified_info{generate}->{$_}) {

                           (my $x = $_) =~ s/\.S$/.s/; $x

                       } else {

                           $_

                       }

                     } ( @{$args{srcs}} );

      my $srcs = join(" ",  @srcs);

      my $deps = join(" ", @srcs, @{$args{deps}});

      my $incs = join("", map { " -I".$_ } @{$args{incs}});

Configurations/windows-makefile.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -290,7 +290,12 @@ EOF 
 sub src2obj {

     my %args = @_;

     my $obj = $args{obj};

     my @srcs = map { (my $x = $_) =~ s/\.[sS]$/.asm/; $x } ( @{$args{srcs}} );

      my @srcs = map { if ($unified_info{generate}->{$_}) {

                           (my $x = $_) =~ s/\.[sS]$/.asm/; $x

                       } else {

                           $_

                       }

                     } ( @{$args{srcs}} );

     my $srcs = join(" ",  @srcs);

     my $deps = join(" ", @srcs, @{$args{deps}});

     my $incs = join("", map { " /I ".$_ } @{$args{incs}});