diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-09-13 13:39:13 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2022-11-08 22:46:32 -0500 |
| commit | 36cc06341a0c5029f49efaeef744dc3e9758e669 (patch) | |
| tree | 3ce492c34bcbcaae00c769f58db975bb4c6be80c /Makerules | |
| parent | 2fce85f67c56e46863db40b8ca75bbf0fa993053 (diff) | |
| download | glibc-36cc06341a0c5029f49efaeef744dc3e9758e669.tar.gz glibc-36cc06341a0c5029f49efaeef744dc3e9758e669.tar.xz glibc-36cc06341a0c5029f49efaeef744dc3e9758e669.zip | |
Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 [BZ# 29564]
make-4.4 will add long flags to MAKEFLAGS variable:
* WARNING: Backward-incompatibility!
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.
This causes locale builds to fail when long options are used:
$ make --shuffle
...
make -C localedata install-locales
make: invalid shuffle mode: '1662724426r'
The change fixes it by passing eash option via whitespace and dashes.
That way option is appended to both single-word form and whitespace
separated form.
While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering
out --long-options. Otherwise options like --shuffle flag enable silent
mode unintentionally. $(silent-make) variable consolidates the checks.
Resolves: BZ# 29564
CC: Paul Smith <psmith@gnu.org>
CC: Siddhesh Poyarekar <siddhesh@gotplt.org>
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
(cherry picked from commit 2d7ed98add14f75041499ac189696c9bd3d757fe)
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makerules b/Makerules index d1e139d03c..09c0cf8357 100644 --- a/Makerules +++ b/Makerules @@ -794,7 +794,7 @@ endif # Maximize efficiency by minimizing the number of rules. .SUFFIXES: # Clear the suffix list. We don't use suffix rules. # Don't define any builtin rules. -MAKEFLAGS := $(MAKEFLAGS)r +MAKEFLAGS := $(MAKEFLAGS) -r # Generic rule for making directories. %/: @@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) # Use the verbose option of ar and tar when not running silently. -ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s +ifeq ($(silent-make),no) # if not -s verbose := v else # -s verbose := |