[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  6ddcf90fae372da897bdf84d0949618bbdb4abab (commit)
      from  c255668c61e6b4800aa9c6e293a12942eccf511b (commit)


- Log -----------------------------------------------------------------
commit 6ddcf90fae372da897bdf84d0949618bbdb4abab
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Apr 4 15:28:19 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/5871)

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 40cf2c3..1bfaa97 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -848,7 +848,7 @@ EOF
           $recipe .= <<"EOF";
 $obj$objext: $deps
 	( trap "rm -f \$@.*" INT 0; \\
-	  \$(CPP) $incs \$(CFLAGS) $ecflags $srcs | \\
+	  \$(CC) $incs \$(CFLAGS) $ecflags -E $srcs | \\
 	  \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\
 	  \$(CC) \$(CFLAGS) $ecflags -c -o \$\@ \$@.s )
 EOF