Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1437201 - Part 1: Don't try to use target as host with clang for Android. r=froydnj

Browse Source 
The heuristic simply fails for clang as shipped in Android NDKs: those
clang binaries can't target any non-Android host.

MozReview-Commit-ID: 6AhOJxE3boW

--HG--
extra : rebase_source : 3716d4ff7ce2f1e796489e02e312d7554a5b1e6c
This commit is contained in:
Nick Alexander 2018-02-09 14:32:28 -08:00
parent 68000223b0
commit 12c4a78357
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/moz.configure/toolchain.configure
View File

@ -779,21 +779,26 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
# doesn't match the target C compiler.
# As a special case, since clang supports all kinds of targets in the same
# executable, when cross compiling with clang, default to the same compiler
# as the target compiler, resetting flags.
# as the target compiler, resetting flags. However, Android NDK clangs do
# not function as host compilers -- they're target compilers only -- so
# don't use clang target as host if the target OS is Android.
if host_or_target == host:
if other_c_compiler is not None:
args = (c_compiler, other_c_compiler)
else:
args = ()
@depends(provided_compiler, other_compiler, cross_compiling, *args)
def provided_compiler(value, other_compiler, cross_compiling, *args):
@depends(provided_compiler, other_compiler, cross_compiling,
target, *args)
def provided_compiler(value, other_compiler, cross_compiling,
target, *args):
if value:
return value
c_compiler, other_c_compiler = args if args else (None, None)
if not cross_compiling and c_compiler == other_c_compiler:
return other_compiler
if cross_compiling and other_compiler.type == 'clang':
if cross_compiling and other_compiler.type == 'clang' and \
target.os != 'Android':
return namespace(**{
k: [] if k == 'flags' else v
for k, v in other_compiler.__dict__.iteritems()