Building 9.2-RELEASE on 10-stable

[Andreas Nilsson]

Sorry for previous noise, I was tired...

The below two patches both seems to solve the "A failure has been detected
in another branch of the parallel make". Which one is preferred?

Index: tools/build/make_check/Makefile

===================================================================

--- tools/build/make_check/Makefile     (revision 258038)

+++ tools/build/make_check/Makefile     (working copy)

@@ -1,7 +1,7 @@

 # $FreeBSD$



 .MAKE.MODE=    normal

-

+.NOTPARALLEL

 # Test for broken LHS expansion.

 # This *must* cause make(1) to detect a recursive variable, and fail as
such.

 .if make(lhs_expn)


and


Index: Makefile

===================================================================

--- Makefile    (revision 258038)

+++ Makefile    (working copy)

@@ -288,7 +288,7 @@

 upgrade_checks:

        @if ! (cd ${.CURDIR}/tools/build/make_check && \

            PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \

-           PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \

+           PATH=${PATH} ${BINMAKE} ${MAKEFLAGS:N-j*} >/dev/null 2>&1); \

        then \

            (cd ${.CURDIR} && ${MAKE} make); \

        fi


Best regards

Andreas
-------------- next part --------------
Index: tools/build/make_check/Makefile
===================================================================
--- tools/build/make_check/Makefile	(revision 258038)
+++ tools/build/make_check/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .MAKE.MODE=	normal
-
+.NOTPARALLEL
 # Test for broken LHS expansion.
 # This *must* cause make(1) to detect a recursive variable, and fail as such.
 .if make(lhs_expn)
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 258038)
+++ Makefile	(working copy)
@@ -288,7 +288,7 @@
 upgrade_checks:
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
-	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
+	    PATH=${PATH} ${BINMAKE} ${MAKEFLAGS:N-j*} >/dev/null 2>&1); \
 	then \
 	    (cd ${.CURDIR} && ${MAKE} make); \
 	fi