From owner-svn-src-user@FreeBSD.ORG Tue Jul 15 22:34:55 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3C4C9B86;
Tue, 15 Jul 2014 22:34:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2A0BC2CC5;
Tue, 15 Jul 2014 22:34:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FMYt9J046378;
Tue, 15 Jul 2014 22:34:55 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FMYscL046376;
Tue, 15 Jul 2014 22:34:54 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201407152234.s6FMYscL046376@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 15 Jul 2014 22:34:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r268719 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2014 22:34:55 -0000
Author: des
Date: Tue Jul 15 22:34:54 2014
New Revision: 268719
URL: http://svnweb.freebsd.org/changeset/base/268719
Log:
Partially revert r266617: the cross-building logic should already take
care of this. Setting MAKESYSPATH worked around a case where share/mk
was broken, but breaks legitimate cases where share/mk uses features
which are not supported by the host's version of make(1).
Modified:
user/des/tinderbox/tinderbox.1
user/des/tinderbox/tinderbox.pl
Modified: user/des/tinderbox/tinderbox.1
==============================================================================
--- user/des/tinderbox/tinderbox.1 Tue Jul 15 22:18:25 2014 (r268718)
+++ user/des/tinderbox/tinderbox.1 Tue Jul 15 22:34:54 2014 (r268719)
@@ -316,8 +316,6 @@ The following variables are set for all
.Ar /dev/null
.It SRCCONF
.Ar /dev/null
-.It MAKESYSPATH
-.Ar $srcdir/share/mk
.It MAKEOBJDIRPREFIX
.Ar $objdir
.It TARGET
Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl Tue Jul 15 22:18:25 2014 (r268718)
+++ user/des/tinderbox/tinderbox.pl Tue Jul 15 22:34:54 2014 (r268719)
@@ -736,7 +736,6 @@ MAIN:{
'__MAKE_CONF' => "/dev/null",
'SRCCONF' => "/dev/null",
- 'MAKESYSPATH' => "$srcdir/share/mk",
'MAKEOBJDIRPREFIX' => $objdir,
'TARGET' => $machine,