Build file templates: look at *all* defines
authorRichard Levitte <levitte@openssl.org>
Mon, 15 Oct 2018 15:38:26 +0000 (17:38 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 17 Oct 2018 08:57:17 +0000 (10:57 +0200)
commit92ebf6c4c21ff4b41ba1fd69af74b2039e138114
treeff8bb77e656e63a9a2b2f7bbb3a0f5bb9871171c
parent61bef9bde09dc6099a7c59baa79898e3b003fec3
Build file templates: look at *all* defines

When looking at configured macro definitions, we must look at both
what comes from the config target AND what comes from user
configuration.

Fixes #7396

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/7402)
Configurations/unix-Makefile.tmpl
Configurations/windows-makefile.tmpl