diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-07 19:23:39 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-07 22:16:44 +0100 |
| commit | cb7b7275683655537c63e42b5e3ef3d7045e4104 (patch) | |
| tree | 13f06a736e7ad3da9cc2e935a61f77056300e3c6 /Configurations | |
| parent | 3a7141df8768e797f42ed14027e974ea845aa20f (diff) | |
mkerr.pl: When writing internal FOOerr.h, pay attention to disablable modules
If a module is disablable (i.e. can be configured with 'no-FOO'), the
resulting header file needs to be guarded with a check of the
corresponding OPENSSL_NO_FOO. While this seem fairly innocuous, it
has an impact on the information in util/*.num, generated by mkdef.pl.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5275)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 3dd66b8baa..9e05fd1d5f 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -674,10 +674,11 @@ generate_fuzz_oids: ERROR_REBUILD= errors: ( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c ) - ( cd $(SRCDIR); $(PERL) util/mkerr.pl $(ERROR_REBUILD) -internal ) - ( cd $(SRCDIR)/engines; \ + ( b=`pwd`; cd $(SRCDIR); \ + $(PERL) -I$$b util/mkerr.pl $(ERROR_REBUILD) -internal ) + ( b=`pwd`; cd $(SRCDIR)/engines; \ for E in *.ec ; do \ - $(PERL) ../util/mkerr.pl $(ERROR_REBUILD) -static \ + $(PERL) -I$$b ../util/mkerr.pl $(ERROR_REBUILD) -static \ -conf $$E `basename $$E .ec`.c ; \ done ) |