diff options
| author | Pavan Deolasee | 2016-03-01 10:16:02 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2016-10-18 10:00:18 +0000 |
| commit | ba374d3ce8b100c688c99876377af057693f4b80 (patch) | |
| tree | 232f017be5f58c02c85a15b069e60207f2ed5a10 | |
| parent | 53db4e0dd31d89fc8bce1e4bab2512e4360b8119 (diff) | |
Use -P preprocessor option to avoid to inhibit generation of linemarkers in the
output from the preprocessor
This ensures that grepping for the elog messages works correctly on various
compilers (tested for gcc and clang)
| -rw-r--r-- | GNUmakefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.global.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 78a915bb22..f6ab57ef1c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -50,6 +50,8 @@ clean: rm -rf tmp_install/ # Garbage from autoconf: @rm -rf autom4te.cache/ +# Remove MSGIDS file too + rm -f MSGIDS # Important: distclean `src' last, otherwise Makefile.global # will be gone too soon. diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 538519fd7d..de335abf0b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -842,7 +842,7 @@ endif # enable_coverage genmsgids = @genmsgids@ ifeq ($(genmsgids), yes) -PREPROCESS.c = $(CC) $(CFLAGS) $(CPPFLAGS) -E +PREPROCESS.c = $(CC) $(CFLAGS) $(CPPFLAGS) -E -P PGXL_MSG_FILEID := 1 PGXL_MSG_MODULE := $(shell cat $(top_builddir)/MSGMODULES | grep -E "^subdir = $(subdir):" | cut -d ':' -f 2) |