From a9c474dc98233ce6e64b898874e3604cc151f461 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 19 Sep 2022 11:48:27 +0200 Subject: [PATCH] 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 Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/19276) --- Configurations/descrip.mms.tmpl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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);