NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitcee83ef

committed

Invoke submake-generated-headers during "make check", too.

The MAKELEVEL hack to prevent submake-generated-headers from doinganything in child make runs means that we have to explicitly invokeit at top level for "make check", too, in case somebody proceedsdirectly to that without an explicit "make all". (I think thisusage had parallel-make hazards even before the addition of moregenerated headers; but it was totally broken as of3b8f6e7.)Out of paranoia, force the submake-libpq target to depend onsubmake-generated-headers, too. This seems to not be absolutelynecessary today, but it's not really saving us anything to omitthe ordering dependency, and it'll likely break someday without it.Discussion:https://postgr.es/m/20180411103930.GB31461@momjian.us

1 parent9289999 commitcee83efCopy full SHA for cee83ef

File tree

1 file changed

-7

lines changed

src
- Makefile.global.in

1 file changed

-7

lines changed

`‎src/Makefile.global.in`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,11 +355,11 @@ BZIP2= bzip2`
`355`	`355`	`# available before building, but we don't want parallel makes all trying`
`356`	`356`	`# to build the same headers. These rules, together with the recursion rules`
`357`	`357`	`# below, ensure that we update the generated headers once, if needed,`
`358`		`-# at the top level of any "make all" or "makeinstall" request. If a`
`359`		`-#particularsubdirectory knows this isn't needed in itself or its children,`
`360`		`-#it can setNO_GENERATED_HEADERS.`
	`358`	`+# at the top level of any "make all/install/check" request. If a particular`
	`359`	`+# subdirectory knows this isn't needed in itself or its children, it can set`
	`360`	`+# NO_GENERATED_HEADERS.`
`361`	`361`
`362`		`-allinstall: submake-generated-headers`
	`362`	`+allinstallcheck: submake-generated-headers`
`363`	`363`
`364`	`364`	`.PHONY: submake-generated-headers`
`365`	`365`
`@@ -381,7 +381,7 @@ check: temp-install`
`381`	`381`
`382`	`382`	`.PHONY: temp-install`
`383`	`383`
`384`		`-temp-install:`
	`384`	`+temp-install: \| submake-generated-headers`
`385`	`385`	`ifndefNO_TEMP_INSTALL`
`386`	`386`	`ifneq ($(abs_top_builddir),)`
`387`	`387`	`ifeq ($(MAKELEVEL),0)`
`@@ -560,7 +560,7 @@ endif`
`560`	`560`	`#`
`561`	`561`	`# Commonly used submake targets`
`562`	`562`
`563`		`-submake-libpq:`
	`563`	`+submake-libpq: \| submake-generated-headers`
`564`	`564`	`$(MAKE) -C$(libpq_builddir) all`
`565`	`565`
`566`	`566`	`submake-libpgport: \| submake-generated-headers`
`@@ -820,7 +820,7 @@ endif`
`820`	`820`	`define_create_recursive_target`
`821`	`821`	`.PHONY:$(1)-$(2)-recurse`
`822`	`822`	`$(1):$(1)-$(2)-recurse`
`823`		`-$(1)-$(2)-recurse:$(if$(filter all install,$(3)), submake-generated-headers)$(if$(filter check,$(3)), temp-install)`
	`823`	`+$(1)-$(2)-recurse:$(if$(filter all install check,$(3)), submake-generated-headers)$(if$(filter check,$(3)), temp-install)`
`824`	`824`	`$$(MAKE) -C$(2)$(3)`
`825`	`825`	`endef`
`826`	`826`	`# Note that the use of $$ on the last line above is important; we want`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcee83ef

File tree

1 file changed

1 file changed

`‎src/Makefile.global.in`

0 commit comments