From c7aa6443907ddd97b6b1e8729ce9c897de0d244c Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 15 Jan 2015 13:50:09 +0000 Subject: 34287: preprocessor for signal name generation. Some gcc header files are difficult for the signames2.awk script to process, so if the preprocessor is gcc give the option -P to strip out the unwanted additions. --- Src/zsh.mdd | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Src') diff --git a/Src/zsh.mdd b/Src/zsh.mdd index f0379d2d1..71dd61374 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -22,9 +22,18 @@ hdrdeps="zshcurses.h zshterm.h" :<<\Make @CONFIG_MK@ +# If we're using gcc as the preprocessor, get rid of the additional +# lines generated by the preprocessor as they can confuse the script. +# We don't need these in other cases either, but can't necessarily rely +# on the option to remove them being the same. signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@ $(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c - $(CPP) sigtmp.c >sigtmp.out + case "$(CPP)" in \ + gcc*) \ + $(CPP) -P sigtmp.c >sigtmp.out;; \ + *) \ + $(CPP) sigtmp.c >sigtmp.out;; \ + esac $(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@ rm -f sigtmp.c sigtmp.out -- cgit 1.4.1