[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f19d20b60fcdfde802f96afa3796f20d0da25eab (commit)
       via  c739e676ebc6e7f66aabee1ac3d2040b3103a890 (commit)
      from  900fd8f375ca758d182e894bc1556509b231dbc8 (commit)


- Log -----------------------------------------------------------------
commit f19d20b60fcdfde802f96afa3796f20d0da25eab
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Nov 25 00:56:54 2018 +0100

    VMS build: don't forget the generation marker when removing files
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7703)

commit c739e676ebc6e7f66aabee1ac3d2040b3103a890
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Nov 25 00:52:24 2018 +0100

    VMS build: in descrip.mms.tmpl's src2obj, do .S -> .asm too
    
    We only convert lowercase .s to .asm, that turned out not to be sufficient.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7703)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index d06c699..c6a31c8 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -823,7 +823,7 @@ $target : $args{generator}->[0] $deps
         \@ DELETE/SYMBOL/LOCAL extradefines
         \@ $incs_off
         RENAME \$\@-i \$\@
-        DELETE \$\@-S
+        DELETE \$\@-S;
 EOF
               }
               # Otherwise....
@@ -847,7 +847,7 @@ EOF
 
   sub src2obj {
       my %args = @_;
-      my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
+      my @srcs = map { (my $x = $_) =~ s/\.[sS]$/.asm/; $x
                      } ( @{$args{srcs}} );
       (my $obj = $args{obj}) =~ s|\.o$||;
       my $deps = join(", -\n\t\t", @srcs, @{$args{deps}});