diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-22 16:33:58 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-22 21:56:41 +0100 |
| commit | 8bc0147ff863bcf47dea5c71cf1d4f17b3b6914e (patch) | |
| tree | e7385891d00a54bca80d2ac553b2fbb90ff02935 /Configurations | |
| parent | 1af563e3742c5be733194dab9778e064984b3c23 (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')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 8 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
3 files changed, 13 insertions, 9 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}}, diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index b3edd66a56..365499e001 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -850,9 +850,9 @@ EOF } my $cppflags = { - lib => '$(LIB_CPPFLAGS)', - dso => '$(DSO_CPPFLAGS)', - bin => '$(BIN_CPPFLAGS)' + lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', + dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)', + bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)' } -> {$args{intent}}; if (defined($generator)) { # If the target is named foo.S in build.info, we want to diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 3e8348ef6b..719397239d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -436,9 +436,11 @@ EOF } my $cppflags = $incs; - $cppflags .= { lib => '$(LIB_CPPFLAGS)', - dso => '$(DSO_CPPFLAGS)', - bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}}; + $cppflags .= { + lib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)', + dso => ' $(DSO_CFLAGS) $(DSO_CPPFLAGS)', + bin => ' $(BIN_CFLAGS) $(BIN_CPPFLAGS)' + } -> {$args{intent}}; if (defined($generator)) { # If the target is named foo.S in build.info, we want to # end up generating foo.s in two steps. |