diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-04 08:53:11 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:57 +0100 |
| commit | 0490314f651bdd2888b7839f07c7591877e59bd5 (patch) | |
| tree | e38a0d7fdefe44fafcc0d126e17424f8198ec6f1 | |
| parent | 962963395c37d015474ef03c41396b78196e301c (diff) | |
Make 'make errors' work again
util/mkerr.pl detects if a header is now a '.in' template, and adjusts
the header file it reads accordingly.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12781)
| -rwxr-xr-x | util/mkerr.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl index 44332d423e..16ca06ef83 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -263,7 +263,9 @@ while ( ( my $hdr, my $lib ) = each %libinc ) { my $linenr = 0; my $cpp = 0; - open(IN, "<$hdr") || die "Can't open $hdr, $!,"; + open(IN, "<$hdr") + || open(IN, "<$hdr.in") + || die "Can't open $hdr or $hdr.in, $!,"; while ( <IN> ) { $linenr++; @@ -435,7 +437,6 @@ foreach my $lib ( keys %errorfile ) { # Rewrite the header file my $hfile = $hinc{$lib}; - $hfile =~ s/.h$/err.h/ if $internal; open( OUT, ">$hfile" ) || die "Can't write to $hfile, $!,"; print OUT <<"EOF"; /* |