Commit 39199fb3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent b4de72bf

Configurations/unix-Makefile.tmpl

+5 −2
Original line number Diff line number Diff line
@@ -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

      }

  }