svn commit: r248343 - projects/bmake/share/mk

[Simon J. Gerraty]

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)]