@@ -541,8 +541,14 @@ def arch_set_build_arch(d, gcc_version):
def arch_set_cross_arch(d, prefix, gcc_version):
- cross_arch = '%s-%s'%(d.get(prefix+'_CPU', True),
- d.get(prefix+'_OS', True))
+ vendor = d.get(prefix+'_VENDOR', True)
+ if vendor:
+ cross_arch = '%s-%s-%s'%(d.get(prefix+'_CPU', True),
+ vendor,
+ d.get(prefix+'_OS', True))
+ else:
+ cross_arch = '%s-%s'%(d.get(prefix+'_CPU', True),
+ d.get(prefix+'_OS', True))
cross_arch = arch_config_sub(d, cross_arch)
abis = (d.get(prefix+'_ABI', True) or "").split()
if prefix == "MACHINE":