forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Not updating the whole snapshot as unrelated patches break some of timezone-related tests: NixOS#201805 (comment) Let's unblock `make-4.4` first.
- Loading branch information
Showing
2 changed files
with
69 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2d7ed98add14f75041499ac189696c9bd3d757fe | ||
--- a/Makeconfig | ||
+++ b/Makeconfig | ||
@@ -43,6 +43,22 @@ else | ||
$(error objdir must be defined by the build-directory Makefile) | ||
endif | ||
|
||
+# Did we request 'make -s' run? "yes" or "no". | ||
+# Starting from make-4.4 MAKEFLAGS now contains long | ||
+# options like '--shuffle'. To detect presence of 's' | ||
+# we pick first word with short options. Long options | ||
+# are guaranteed to come after whitespace. We use '-' | ||
+# prefix to always have a word before long options | ||
+# even if no short options were passed. | ||
+# Typical MAKEFLAGS values to watch for: | ||
+# "rs --shuffle=42" (silent) | ||
+# " --shuffle" (not silent) | ||
+ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) | ||
+silent-make := no | ||
+else | ||
+silent-make := yes | ||
+endif | ||
+ | ||
# Root of the sysdeps tree. | ||
sysdep_dir := $(..)sysdeps | ||
export sysdep_dir := $(sysdep_dir) | ||
@@ -917,7 +933,7 @@ endif | ||
# umpteen zillion filenames along with it (we use `...' instead) | ||
# but we don't want this echoing done when the user has said | ||
# he doesn't want to see commands echoed by using -s. | ||
-ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s | ||
+ifeq ($(silent-make),yes) # if -s | ||
+cmdecho := echo >/dev/null | ||
else # not -s | ||
+cmdecho := echo | ||
--- 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 := | ||
--- a/elf/rtld-Rules | ||
+++ b/elf/rtld-Rules | ||
@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\ | ||
mv -f $@T $@ | ||
|
||
# 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 := |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters