Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitcee83ef

Browse files
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 commitcee83ef

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

‎src/Makefile.global.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@ BZIP2= bzip2
355355
# available before building, but we don't want parallel makes all trying
356356
# to build the same headers. These rules, together with the recursion rules
357357
# 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.
361361

362-
allinstall: submake-generated-headers
362+
allinstallcheck: submake-generated-headers
363363

364364
.PHONY: submake-generated-headers
365365

@@ -381,7 +381,7 @@ check: temp-install
381381

382382
.PHONY: temp-install
383383

384-
temp-install:
384+
temp-install: | submake-generated-headers
385385
ifndefNO_TEMP_INSTALL
386386
ifneq ($(abs_top_builddir),)
387387
ifeq ($(MAKELEVEL),0)
@@ -560,7 +560,7 @@ endif
560560
#
561561
# Commonly used submake targets
562562

563-
submake-libpq:
563+
submake-libpq: | submake-generated-headers
564564
$(MAKE) -C$(libpq_builddir) all
565565

566566
submake-libpgport: | submake-generated-headers
@@ -820,7 +820,7 @@ endif
820820
define_create_recursive_target
821821
.PHONY:$(1)-$(2)-recurse
822822
$(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)
824824
$$(MAKE) -C$(2)$(3)
825825
endef
826826
# Note that the use of $$ on the last line above is important; we want

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp