From owner-svn-src-all@FreeBSD.ORG  Wed May  9 04:54:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7DDB7106564A;
	Wed,  9 May 2012 04:54:51 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 699008FC0C;
	Wed,  9 May 2012 04:54:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q494spX9066557;
	Wed, 9 May 2012 04:54:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q494spm1066555;
	Wed, 9 May 2012 04:54:51 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201205090454.q494spm1066555@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 9 May 2012 04:54:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235152 - head/usr.bin/make
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 May 2012 04:54:51 -0000

Author: imp
Date: Wed May  9 04:54:50 2012
New Revision: 235152
URL: http://svn.freebsd.org/changeset/base/235152

Log:
  Make is part of the bootstrap path, so we need to guard against this
  not being defined.  Otherwise we don't make a new make when the old
  make is incompatible.

Modified:
  head/usr.bin/make/Makefile

Modified: head/usr.bin/make/Makefile
==============================================================================
--- head/usr.bin/make/Makefile	Wed May  9 01:55:23 2012	(r235151)
+++ head/usr.bin/make/Makefile	Wed May  9 04:54:50 2012	(r235152)
@@ -10,7 +10,7 @@ SRCS=	arch.c buf.c cond.c dir.c for.c ha
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
+.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=	YES
 .endif