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

Commit7dc5a96

Browse files
committed
Ensure we build generated headers at the start of some more cases.
"make installcheck" and some related cases, when invoked from the topleveldirectory, start out by doing "make all" in src/test/regress. Since that'sone make recursion level down, the submake-generated-headers target willdo nothing, causing us to fail to create/update generated headers beforebuilding pg_regress. This is, I believe, a new failure mode induced bycommit3b8f6e7, so let's fix it. To do so, we have to invokesubmake-generated-headers at the top level.Discussion:https://postgr.es/m/0401efec-68f1-679d-3ea3-21d4e8dd11af@gmail.com
1 parent4f10e7e commit7dc5a96

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ distclean maintainer-clean:
6363
@rm -rf autom4te.cache/
6464
rm -f config.cache config.log config.status GNUmakefile
6565

66-
check check-tests installcheck installcheck-parallel installcheck-tests:
66+
check check-tests installcheck installcheck-parallel installcheck-tests: submake-generated-headers
6767
$(MAKE) -C src/test/regress $@
6868

6969
$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)

‎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/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.
358+
# at the top level of any "make all/install/check/installcheck" request.
359+
#If a particularsubdirectory knows this isn't needed in itself or its
360+
#children, it can setNO_GENERATED_HEADERS.
361361

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

364364
.PHONY: submake-generated-headers
365365

@@ -806,8 +806,8 @@ $(error GNU make 3.80 or newer is required. You are using version $(MAKE_VERSIO
806806
endif
807807

808808
# This function is only for internal use below. It should be called
809-
# using $(eval). It will set up a target so that it recurses into
810-
#agiven subdirectory. For the tree-wide all/install/check cases,
809+
# using $(eval). It will set up a target so that it recurses into a
810+
# given subdirectory. For the tree-wide all/install/check/installcheck cases,
811811
# ensure we do our one-time tasks before recursing (see targets above).
812812
# Note that to avoid a nasty bug in make 3.80,
813813
# this function has to avoid using any complicated constructs (like
@@ -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 check,$(3)), submake-generated-headers)$(if$(filter check,$(3)), temp-install)
823+
$(1)-$(2)-recurse:$(if$(filter all install check installcheck,$(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