diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-19 14:43:31 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-29 12:52:58 +0100 |
| commit | d88736df4d19521664ebb125ff66e0d7b085a53c (patch) | |
| tree | 8d4d0b80732b563c92cebc78876740acd0b90a2e /Configurations/windows-makefile.tmpl | |
| parent | 72962d025f875ac35114ac090b878ee18b246144 (diff) | |
Windows, VMS: build fixes
The naming of generated assembler wasn't done quite right. There are
assembler files that are generated from a perl script, and there are
those who are not. Only the former must be renamed to the platform
specific asm extension.
Furthermore, we need to make sure that 'OSSL_provider_init' isn't case
sensitive on VMS, to allow for the least surprise for provider
builders.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8529)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 8999d6f140..a1daf7d696 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -601,8 +601,13 @@ EOF } sub src2obj { + my $asmext = platform->asmext(); my %args = @_; - my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x } ( @{$args{srcs}} ); + my @srcs = + map { my $x = $_; + (platform->isasm($x) && grep { $x eq $_ } @generated) + ? platform->asm($x) : $x } + ( @{$args{srcs}} ); my $srcs = '"'.join('" "', @srcs).'"'; my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}}); @@ -630,7 +635,7 @@ EOF } my $obj = platform->obj($args{obj}); my $dep = platform->dep($args{obj}); - if ($srcs[0] =~ /\.asm$/) { + if ($srcs[0] =~ /\Q${asmext}\E$/) { return <<"EOF"; $obj: $deps \$(AS) $asflags \$(ASOUTFLAG)\$\@ $srcs |