diff options
author | Richard Levitte <levitte@openssl.org> | 2022-09-19 11:48:27 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2022-09-28 11:01:14 +0200 |
commit | a9c474dc98233ce6e64b898874e3604cc151f461 (patch) | |
tree | a754cbc77daacba6006e9c1cf2ececb257afb4cd /Configurations/descrip.mms.tmpl | |
parent | 1fcd84c7017416a3c9461914d7a943591ad87a82 (diff) |
Configurations/descrip.mms.tmpl: Add another inclusion hack
More adaptations are needed for sources in ssl/, which all include
`ssl/ssl_local.h`.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19276)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index b7d1df2592..b73db70c7d 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -227,6 +227,14 @@ my $obj = platform->obj($_); push @{$unified_info{includes_extra}->{$obj}}, qw(../); } + 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. + push @{$unified_info{includes_extra}->{$obj}}, qw(./); + } 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 @@ -236,6 +244,14 @@ push @{$unified_info{includes_extra}->{$obj}}, qw(../); } + foreach (grep /\[\.ssl\.record\.methods\].*?\.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. + push @{$unified_info{includes_extra}->{$obj}}, qw(../../); + } foreach (grep /\[\.test\].*?\.o$/, keys %{$unified_info{sources}}) { my $obj = platform->obj($_); push @{$unified_info{includes_extra}->{$obj}}, qw(../ssl ./helpers); |