diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-02 23:38:11 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-03 20:57:00 +0200 |
| commit | 39199fb3b052bd19a5c2a65c51721222e6d856b5 (patch) | |
| tree | f1d9c4920d6fb1267cdc03108aa2349dfac0aa42 /Configurations/unix-Makefile.tmpl | |
| parent | b4de72bf641ca195588cc7f758edda171709fdfe (diff) | |
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@openssl.org>
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 974a978fb3..ea3b7083e6 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 } } |