[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d3f9268aa58507eb2d25fd0b49f54efdc098f4e6 (commit)
      from  d8fa9324d25b07efd45761a0fee6b0f89c18924b (commit)


- Log -----------------------------------------------------------------
commit d3f9268aa58507eb2d25fd0b49f54efdc098f4e6
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Apr 4 15:23:30 2018 +0200

    Don't use CPP in Configurations/unix-Makefile.tmpl
    
    We started using $(CPP) instead of $(CC) -E, with the assumption that
    CPP would be predefined.  This is, however, not always true, and
    rather depends on the 'make' implementation.  Furthermore, on
    platforms where CPP=cpp or something else other than '$(CC) -E',
    there's a risk that it won't understand machine specific flags that we
    pass to it.  So it turns out that trying to use $(CPP) was a mistake,
    and we therefore revert that use back to using $(CC) -E directly.
    
    Fixes #5867
    
    Note: this affects config targets that use Alpha, ARM, IA64, MIPS,
    s390x or SPARC assembler modules.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5872)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index cc66abe..caf2783 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -954,7 +954,7 @@ EOF
           }
           return <<"EOF";
 $args{src}: $args{generator}->[0] $deps
-	\$(CPP) $incs $cppflags $args{generator}->[0] | \\
+	\$(CC) $incs $cppflags -E $args{generator}->[0] | \\
 	\$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@
 EOF
       }
@@ -1012,7 +1012,7 @@ EOF
           $recipe .= <<"EOF";
 $obj$objext: $deps
 	( trap "rm -f \$@.*" INT 0; \\
-	  \$(CPP) $incs $cmdflags $srcs | \\
+	  \$(CC) $incs $cmdflags -E $srcs | \\
 	  \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\
 	  $cmd $cmdflags -c -o \$\@ \$@.s )
 EOF