[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8bc0147ff863bcf47dea5c71cf1d4f17b3b6914e (commit)
      from  1af563e3742c5be733194dab9778e064984b3c23 (commit)


- Log -----------------------------------------------------------------
commit 8bc0147ff863bcf47dea5c71cf1d4f17b3b6914e
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 22 16:33:58 2018 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5436)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      | 8 +++++---
 Configurations/unix-Makefile.tmpl    | 6 +++---
 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 72bae8b..2364644 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 b3edd66..365499e 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 3e8348e..7193972 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.