[PATCH] Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.

[PATCH] Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.

[Fernando J. Pereda]

Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
---

  I don't know if this breaks non-gnu make, and don't have an easy way
  to test it right now. So someone should do that before it is applied.

  This is needed for GNU make to let sub-makes connect to the jobserver
  when multiple jobs are specified (-j option to make). It was not
  needed before 74f2b2a8d006a49e1be7e30731c2f7365d2741d1 because of how
  GNU make works.

  - ferdy

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index ad321b3..090ea98 100644
--- a/Makefile
+++ b/Makefile
@@ -657,7 +657,7 @@ ifndef V
 	QUIET_LINK     = @echo '   ' LINK $@;
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 	QUIET_GEN      = @echo '   ' GEN $@;
-	QUIET_SUBDIR0  = @subdir=
+	QUIET_SUBDIR0  = +@subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			 $(MAKE) $(PRINT_DIR) -C $$subdir
 	export V
-- 
1.5.1

Re: [PATCH] Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.

[Junio C Hamano]

"Fernando J. Pereda" <ferdy@gentoo.org> writes:

> Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
> ---
>
>   I don't know if this breaks non-gnu make, and don't have an easy way
>   to test it right now. So someone should do that before it is applied.

I had an impression that our makefile is quite dependent on GNU
make already.  Do people build git without gmake?

>   This is needed for GNU make to let sub-makes connect to the jobserver
>   when multiple jobs are specified (-j option to make). It was not
>   needed before 74f2b2a8d006a49e1be7e30731c2f7365d2741d1 because of how
>   GNU make works.

Thanks.  The info page does not talk about -j but '+' apparently
is needed for jobserver.

       As a special feature, using the variable `MAKE' in the commands of a
    rule alters the effects of the `-t' (`--touch'), `-n' (`--just-print'),
    or `-q' (`--question') option.  Using the `MAKE' variable has the same
    effect as using a `+' character at the beginning of the command line.
    *Note Instead of Executing the Commands: Instead of Execution.  This
    special feature is only enabled if the `MAKE' variable appears directly
    in the command script: it does not apply if the `MAKE' variable is
    referenced through expansion of another variable.  In the latter case
    you must use the `+' token to get these special effects.

Re: [PATCH] Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.

[Shawn O. Pearce]

Junio C Hamano <junkio@cox.net> wrote:
> "Fernando J. Pereda" <ferdy@gentoo.org> writes:
> 
> > Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
> > ---
> >
> >   I don't know if this breaks non-gnu make, and don't have an easy way
> >   to test it right now. So someone should do that before it is applied.
> 
> I had an impression that our makefile is quite dependent on GNU
> make already.  Do people build git without gmake?

You can't build Git without GNU make.  At least not without writing
your own Makefile.  I say include Fernando's change.  ;-)

-- 
Shawn.