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

Closes RT#4447

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 3a3fd2ea1128dfb5251776e63c1fa83ac6bd701d..48cea07d2c994b8d6e8d21b1ac578beb4107f721 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -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}});

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index aea269320f92ae2ddd9b9fae5359a4294bfea812..e4faa95d1fc628d5dc03b83066f77559dba3e00d 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -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}});