aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2023-01-25 11:39:35 +0100
committerPratyush Yadav <me@yadavpratyush.com>2023-01-25 11:39:35 +0100
commita5005ded43149a67290c9b8e83d585daf23716ef (patch)
treecf629868c54334cfef236aa45db2cbd3fd941dbe
parent1e5a89c1b4da13b89b0b66ad59d098ced832c3f0 (diff)
parente69547b7b6484328c3f334934d8737f9b28d6a7e (diff)
downloadgit-a5005ded43149a67290c9b8e83d585daf23716ef.tar.gz
Merge branch 'ab/makeflags'
Backport a Makefile fix from upstream git. * ab/makeflags: Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 56c85a85c1..a0d5a4b28e 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin)
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
endif
-ifeq ($(findstring $(MAKEFLAGS),s),s)
+ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
QUIET_GEN =
endif