mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 05:13:10 +00:00
Silence directory change messages when calling gmake from BSD make
These messages are automatically generated as if `-w` were specified
at the gmake command line. The `--no-print-directory` option supresses
these messages.
(cherry picked from commit b7f1103088
)
This commit is contained in:
parent
30a74dcf2d
commit
0836a5b9b4
1 changed files with 7 additions and 2 deletions
|
@ -1,5 +1,10 @@
|
||||||
JARG =
|
JARG =
|
||||||
GMAKE = "gmake"
|
GMAKE = "gmake"
|
||||||
|
#When gmake is called from another make instance, -w is automatically added
|
||||||
|
#which causes extraneous messages about directory changes to be emitted.
|
||||||
|
#--no-print-directory silences these messages.
|
||||||
|
GARGS = "--no-print-directory"
|
||||||
|
|
||||||
.if "$(.MAKE.JOBS)" != ""
|
.if "$(.MAKE.JOBS)" != ""
|
||||||
JARG = -j$(.MAKE.JOBS)
|
JARG = -j$(.MAKE.JOBS)
|
||||||
.endif
|
.endif
|
||||||
|
@ -9,10 +14,10 @@ JARG = -j$(.MAKE.JOBS)
|
||||||
|
|
||||||
.PHONY: FRC
|
.PHONY: FRC
|
||||||
$(.TARGETS): FRC
|
$(.TARGETS): FRC
|
||||||
$(GMAKE) $(.TARGETS:S,.DONE,,) $(JARG)
|
$(GMAKE) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
|
||||||
|
|
||||||
.DONE .DEFAULT: .SILENT
|
.DONE .DEFAULT: .SILENT
|
||||||
$(GMAKE) $(.TARGETS:S,.DONE,,) $(JARG)
|
$(GMAKE) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
|
||||||
|
|
||||||
.ERROR: .SILENT
|
.ERROR: .SILENT
|
||||||
if ! which $(GMAKE) > /dev/null; then \
|
if ! which $(GMAKE) > /dev/null; then \
|
||||||
|
|
Loading…
Reference in a new issue