1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix parallel make issue with new fmgrprotos.h

Browse Source 
The make rules needed further refinement so that we don't run multiple
generations per build.

reported by Tom Lane
This commit is contained in:
Peter Eisentraut 2017-01-23 15:36:27 -05:00
parent 0bc1207aeb
commit 1a2d9a655a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/Makefile
View File

@ -139,7 +139,10 @@ storage/lmgr/lwlocknames.h: storage/lmgr/generate-lwlocknames.pl storage/lmgr/lw
utils/errcodes.h: utils/generate-errcodes.pl utils/errcodes.txt
$(MAKE) -C utils errcodes.h
utils/fmgroids.h utils/fmgrprotos.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h
# see explanation in parser/Makefile
utils/fmgrprotos.h: utils/fmgroids.h ;
utils/fmgroids.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h
$(MAKE) -C utils $(notdir $@)
utils/probes.h: utils/probes.d

3
src/backend/utils/Makefile
View File

@ -21,7 +21,8 @@ all: errcodes.h fmgroids.h fmgrprotos.h probes.h
$(SUBDIRS:%=%-recursive): fmgroids.h fmgrprotos.h
# see explanation in ../parser/Makefile
fmgroids.h fmgrprotos.h: fmgrtab.c ;
fmgrprotos.h: fmgroids.h ;
fmgroids.h: fmgrtab.c ;
fmgrtab.c: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h
$(PERL) -I $(catalogdir) $< $(top_srcdir)/src/include/catalog/pg_proc.h