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:58:10 +0000 (10:58 +0200)
commit695bc60fe4abbe2e6ef3039f96bade5315778c98
tree97d1c449ed602db67782c5ff8496ece377987d72
parent72a859c9755ef845c83d53986b3d48b0f1ee5430
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)

(cherry picked from commit 92ebf6c4c21ff4b41ba1fd69af74b2039e138114)
Configurations/unix-Makefile.tmpl
Configurations/windows-makefile.tmpl