diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2016-01-21 12:32:29 -0500 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2016-01-21 12:33:35 -0500 |
commit | 4ab2208927d82897928ac7e4162bf65ae700277b (patch) | |
tree | 3295eaf4486e54747138e4d5f3cbff9034f63435 | |
parent | 1c7efc274241c146189360f2af73f74bcaebfa45 (diff) |
linux.config: Allow tools_prefix to differ from host
Some toolchain building tools put a prefix that is
different from the host. So allow the .cbc to override
the tools prefix if necessary.
-rw-r--r-- | cerbero/config.py | 2 | ||||
-rw-r--r-- | config/linux.config | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index 7339f214..83de8bbd 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -92,7 +92,7 @@ class Config (object): 'recipes_remotes', 'ios_platform', 'extra_build_tools', 'distro_packages_install', 'interactive', 'target_arch_flags', 'sysroot', 'isysroot', - 'extra_lib_path', 'cached_sources'] + 'extra_lib_path', 'cached_sources', 'tools_prefix'] def __init__(self): self._check_uninstalled() diff --git a/config/linux.config b/config/linux.config index 27bd9a51..b325aa6c 100644 --- a/config/linux.config +++ b/config/linux.config @@ -53,9 +53,11 @@ if target_arch_flags is not None: if host is None and target_arch != arch: host = _host -tools_prefix = '' -if host is not None and host != '': - tools_prefix = '%s-' % host +if host_prefix is None: + if host is not None and host != '': + tools_prefix = '%s-' % host + else: + tools_prefix = '' if isysroot is not None: os.environ['CPPFLAGS'] += ' -isysroot %s' % (isysroot) |