Skip to content

Commit 67b3687

Browse files
avargitster
authored andcommitted
Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
Since GNU make 4.4 the semantics of the $(MAKEFLAGS) variable has changed in a backward-incompatible way, as its "NEWS" file notes: Previously only simple (one-letter) options were added to the MAKEFLAGS variable that was visible while parsing makefiles. Now, all options are available in MAKEFLAGS. If you want to check MAKEFLAGS for a one-letter option, expanding "$(firstword -$(MAKEFLAGS))" is a reliable way to return the set of one-letter options which can be examined via findstring, etc. This upstream change meant that e.g.: make man Would become very noisy, because in shared.mak we rely on extracting "s" from the $(MAKEFLAGS), which now contains long options like "--jobserver-auth=fifo:<path>", which we'll conflate with the "-s" option. So, let's change this idiom we've been carrying since [1], [2] and [3] as the "NEWS" suggests. Note that the "-" in "-$(MAKEFLAGS)" is critical here, as the variable will always contain leading whitespace if there are no short options, but long options are present. Without it e.g. "make --debug=all" would yield "--debug=all" as the first word, but with it we'll get "-" as intended. Then "-s" for "-s", "-Bs" for "-s -B" etc. 1. 0c3b4aa (git-gui: Support of "make -s" in: do not output anything of the build itself, 2007-03-07) 2. b777434 (Support of "make -s": do not output anything of the build itself, 2007-03-07) 3. bb23009 (Documentation/Makefile: make most operations "quiet", 2009-03-27) Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9f95c7a commit 67b3687

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

git-gui/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin)
116116
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
117117
endif
118118

119-
ifeq ($(findstring $(MAKEFLAGS),s),s)
119+
ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
120120
QUIET_GEN =
121121
endif
122122

shared.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ space := $(empty) $(empty)
3737
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
3838
QUIET_SUBDIR1 =
3939

40-
ifneq ($(findstring w,$(MAKEFLAGS)),w)
40+
ifneq ($(findstring w,$(firstword -$(MAKEFLAGS))),w)
4141
PRINT_DIR = --no-print-directory
4242
else # "make -w"
4343
NO_SUBDIR = :
4444
endif
4545

46-
ifneq ($(findstring s,$(MAKEFLAGS)),s)
46+
ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
4747
ifndef V
4848
## common
4949
QUIET_SUBDIR0 = +@subdir=

0 commit comments

Comments
 (0)