aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-03-19 00:43:46 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-03-19 00:43:46 -0400
commita3e39f83632935911bc159154a33e89495f4a676 (patch)
tree7504b5551b9b600fb9b2c1d13450e23192fdbbab
parent0ea9efbe9ec1bf07cc6ae070bdd54700af08e44d (diff)
downloadpostgresql-a3e39f83632935911bc159154a33e89495f4a676.tar.gz
postgresql-a3e39f83632935911bc159154a33e89495f4a676.zip
Suppress FLEX_NO_BACKUP check for psqlscanslash.l.
The existing infrastructure for FLEX_NO_BACKUP doesn't work reliably when two lexers are built in parallel in the same directory. We can probably fix that, but as a short-term workaround, just don't make the check for psqlscanslash.l. Per buildfarm.
-rw-r--r--src/bin/psql/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 3b56dbea900..5f4038e2cb6 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -48,7 +48,8 @@ psqlscan.c: FLEXFLAGS = -Cfe -p -p
psqlscan.c: FLEX_NO_BACKUP=yes
psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
-psqlscanslash.c: FLEX_NO_BACKUP=yes
+# Ideally we'd check this, but parallel make causes problems:
+# psqlscanslash.c: FLEX_NO_BACKUP=yes
# Latest flex causes warnings in these files.
ifeq ($(GCC),yes)