If self.machine is host we need to also trim self.host_target from
objroots to ensure we do not get confused.
This commit is contained in:
parent
b023fdc47a
commit
8c95c434cb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/bmake/; revision=248343
@ -192,8 +192,11 @@ def __init__(self, name, conf={}):
|
||||
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)]
|
||||
|
Loading…
Reference in New Issue
Block a user