[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  39199fb3b052bd19a5c2a65c51721222e6d856b5 (commit)
      from  b4de72bf641ca195588cc7f758edda171709fdfe (commit)


- Log -----------------------------------------------------------------
commit 39199fb3b052bd19a5c2a65c51721222e6d856b5
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 2 23:38:11 2016 +0200

    Configurations/unix-Makefile.tmpl: don't count on -E -P.
    
    Some non-Gnu compilers interpret -E -P combination differently.
    some prioritize -E over -P, others -P over -E (in which case .i
    file is generated and sometimes truncated because of redirection).
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 974a978..ea3b708 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -846,7 +846,9 @@ EOF
 $target: $args{generator}->[0] $deps
 	( trap "rm -f \$@.*" INT 0; \\
 	  $generator \$@.S; \\
-	  \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@.i && mv -f \$@.i \$@ )
+	  \$(CC) \$(CFLAGS) $incs -E \$@.S | \\
+	  \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.i && \\
+	  mv -f \$@.i \$@ )
 EOF
               }
               # Otherwise....
@@ -857,7 +859,8 @@ EOF
           }
           return <<"EOF";
 $args{src}: $args{generator}->[0] $deps
-	\$(CC) \$(CFLAGS) $incs -E -P \$< > \$@
+	\$(CC) \$(CFLAGS) $incs -E \$< | \\
+	\$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@
 EOF
       }
   }