summaryrefslogtreecommitdiffstats
path: root/crypto/build.info
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-03-06 20:35:30 +0100
committerRichard Levitte <levitte@openssl.org>2018-03-08 17:24:02 +0100
commitabe256e7951e6d57f8f6b4364ea696eb4ead3852 (patch)
treec135023d8af4063a2907a349cb580bebb92849aa /crypto/build.info
parentConfigure et al: rename all dso_* to module_* in shared-info.pl (diff)
downloadopenssl-abe256e7951e6d57f8f6b4364ea696eb4ead3852.tar.xz
openssl-abe256e7951e6d57f8f6b4364ea696eb4ead3852.zip
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the user to override them. However, we need to make a difference between defaults that we use (and that should be overridable by the user) and flags that are crucial for building OpenSSL (should not be overridable). Typically, overridable flags are those setting optimization levels, warnings levels, that kind of thing, while non-overridable flags are, for example, macros that indicate aspects of how the config target should be treated, such as L_ENDIAN and B_ENDIAN. We do that differentiation by allowing upper case attributes in the config targets, named exactly like the "make variables" we support, and reserving the lower case attributes for non-overridable project flags. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5534)
Diffstat (limited to 'crypto/build.info')
-rw-r--r--crypto/build.info2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/build.info b/crypto/build.info
index 0a8f6e22aa..c406a11211 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -11,7 +11,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
DEPEND[cversion.o]=buildinf.h
-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CNF_CFLAGS) $(CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
DEPEND[buildinf.h]=../configdata.pm
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)