The previous method had some unfortunate consequences with
--strict-warnings.  To counteract, revert part of the previous change
and move down the block of code that adds the user cflags and defines.
Reviewed-by: NRich Salz <rsalz@openssl.org>