Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jul 2014 22:34:54 +0000 (UTC)
From:      Dag-Erling Smørgrav <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r268719 - user/des/tinderbox
Message-ID:  <201407152234.s6FMYscL046376@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407152234.s6FMYscL046376>