The branch OpenSSL_1_1_1-stable has been updated via 156c4d6290fddb2379c13870e19a1a8ef0b0f095 (commit) via 316fe11b0a0a6a3c7e3ff72129f09f3ef01bab07 (commit) from 37b07c68ef55058cdb990e8cf81650ae58dbd3ee (commit)
- Log ----------------------------------------------------------------- commit 156c4d6290fddb2379c13870e19a1a8ef0b0f095 Author: Richard Levitte <levi...@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.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7703) (cherry picked from commit f19d20b60fcdfde802f96afa3796f20d0da25eab) commit 316fe11b0a0a6a3c7e3ff72129f09f3ef01bab07 Author: Richard Levitte <levi...@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.d...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7703) (cherry picked from commit c739e676ebc6e7f66aabee1ac3d2040b3103a890) ----------------------------------------------------------------------- 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 40876bd..9eefef8 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -798,7 +798,7 @@ $target : $args{generator}->[0] $deps \$(PERL) -ne "/^#(\\s*line)?\\s*[0-9]+\\s+""/ or print" > \$\@-i \@ $incs_off RENAME \$\@-i \$\@ - DELETE \$\@-S + DELETE \$\@-S; EOF } # Otherwise.... @@ -820,7 +820,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}}); _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits