summaryrefslogtreecommitdiffstats
path: root/Configurations/descrip.mms.tmpl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-22 16:33:58 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-22 21:56:41 +0100
commit8bc0147ff863bcf47dea5c71cf1d4f17b3b6914e (patch)
treee7385891d00a54bca80d2ac553b2fbb90ff02935 /Configurations/descrip.mms.tmpl
parent1af563e3742c5be733194dab9778e064984b3c23 (diff)
Build files: when using $(CPP), use the C flags alongside the CPP flags
The reason for this is that some of the C flags affect built in macros that we may depend on. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5436)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
-rw-r--r--Configurations/descrip.mms.tmpl8
1 files changed, 5 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 72bae8bbd0..2364644bbc 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -658,9 +658,11 @@ EOF
die "Generator type for $src unknown: $generator\n";
}
- my $cppflags = { lib => '$(LIB_CPPFLAGS)',
- dso => '$(DSO_CPPFLAGS)',
- bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
+ my $cppflags = {
+ lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',
+ dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',
+ bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'
+ } -> {$args{intent}};
my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',
dso => '$(DSO_INCLUDES)',
bin => '$(BIN_INCLUDES)' } -> {$args{intent}},