From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 15 20:18:31 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5ECC0E9D;
 Fri, 15 Mar 2013 20:18:31 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 50357F75;
 Fri, 15 Mar 2013 20:18:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FKIVVq053080;
 Fri, 15 Mar 2013 20:18:31 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FKIVrG053078;
 Fri, 15 Mar 2013 20:18:31 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201303152018.r2FKIVrG053078@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 15 Mar 2013 20:18:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248343 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 20:18:31 -0000

Author: sjg
Date: Fri Mar 15 20:18:30 2013
New Revision: 248343
URL: http://svnweb.freebsd.org/changeset/base/248343

Log:
  If self.machine is host we need to also trim self.host_target from
  objroots to ensure we do not get confused.

Modified:
  projects/bmake/share/mk/meta2deps.py

Modified: projects/bmake/share/mk/meta2deps.py
==============================================================================
--- projects/bmake/share/mk/meta2deps.py	Fri Mar 15 20:12:54 2013	(r248342)
+++ projects/bmake/share/mk/meta2deps.py	Fri Mar 15 20:18:30 2013	(r248343)
@@ -192,8 +192,11 @@ class MetaFile:
                 if not _srctop in self.srctops:
                     self.srctops.append(_srctop)
 
+            trim_list = ['/' + self.machine, '/' + self.machine + '/']
+            if self.machine == 'host':
+                trim_list += ['/' + self.host_target, '/' + self.host_target + '/']
             for objroot in getv(conf, 'OBJROOTS', []):
-                for e in ['/' + self.machine, '/' + self.machine + '/']:
+                for e in trim_list:
                     if objroot.endswith(e):
                         # this is not what we want - fix it
                         objroot = objroot[0:-len(e)]