diff options
| author | Richard Levitte <levitte@openssl.org> | 2023-02-02 17:51:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2023-02-08 11:24:02 +0100 |
| commit | ae08ed08e49b945d516294106fa185bb136669b2 (patch) | |
| tree | 91724f766f108763e108a071372066c8b3188d86 /Configurations | |
| parent | 03fd2dcb3431898e54e24b3021e9106257e0fdf0 (diff) | |
Fix more VMS inclusions
inclusing quic/quic_local.h from ssl/ssl_lib.c presented another challenge
for the current VMS C. Since ssl/quic/quic_local.h in turn includes
../ssl_local.h, we compensated for with the usual whack-a-mole in
Configurations/descrip.mms.tmpl.
As far as my personal tests go, this seems to be the last fix of this sort,
so far.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20196)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 85a3c778b7..57834630b9 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -229,12 +229,18 @@ } foreach (grep /\[\.ssl\].*?\.o$/, keys %{$unified_info{sources}}) { my $obj = platform->obj($_); - # Most of the files in [.ssl.record.methods] include "ssl_local.h" - # which includes things like "record/record.h". Adding "./" as an - # inclusion directory helps making this sort of header from these - # directories. + # Most of the files in [.ssl] include "ssl_local.h" which includes things + # like "record/record.h". Adding "./" as an inclusion directory helps + # making this sort of header from these directories. push @{$unified_info{includes_extra}->{$obj}}, qw(./); } + foreach (grep /\[\.ssl\].*?ssl_lib\.o$/, keys %{$unified_info{sources}}) { + my $obj = platform->obj($_); + # Some files in [.ssl] include "quic/quic_local.h", which in turn + # includes "../ssl_local.h". Adding "./quic" as an inclusion directory + # helps making this sort of header from these directories. + push @{$unified_info{includes_extra}->{$obj}}, qw(./quic); + } foreach (grep /\[\.ssl\.(?:record|statem)\].*?\.o$/, keys %{$unified_info{sources}}) { my $obj = platform->obj($_); # Most of the files in [.ssl.record] and [.ssl.statem] include |