Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-29 01:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1396882 - pass extra_toolchain_flags to linker detection invocation; r=glandium

Browse Source 
The linker detection essentitally invokes `$CC -Wl,--version` to
determine which linker will be used.  This invocation works OK for GCC
from the Android NDK, which can find the linker in the same directory;
it doesn't work so well for clang from the NDK, which needs additional
command-line options to point at the directory containing the linker.

We already have extra_toolchain_flags for communicating such options to
other compiler invocations for the target; we should be using
extra_toolchain_flags here as well.
This commit is contained in:
Nathan Froyd 2017-09-12 09:52:13 -04:00
parent 75d68dab36
commit 397f70843c
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

@ -1148,10 +1148,13 @@ imply_option('--enable-linker',
@imports('os') @imports('os')
@imports('shutil') @imports('shutil')
def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_env, linker_name): def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_env,
toolchain_flags, linker_name):
# Used to check the kind of linker # Used to check the kind of linker
version_check = ['-Wl,--version'] version_check = ['-Wl,--version']
cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags
if toolchain_flags:
cmd_base += toolchain_flags
def resolve_gold(): def resolve_gold():
# Try to force the usage of gold # Try to force the usage of gold
@ -1219,12 +1222,14 @@ js_option('--enable-linker', nargs=1,
help='Select the linker', help='Select the linker',
when=build_not_win_mac) when=build_not_win_mac)
@depends('--enable-linker', c_compiler, developer_options, check_build_environment, when=build_not_win_mac) @depends('--enable-linker', c_compiler, developer_options, check_build_environment,
extra_toolchain_flags, when=build_not_win_mac)
@checking('for linker', lambda x: x.KIND) @checking('for linker', lambda x: x.KIND)
def select_linker(linker, c_compiler, developer_options, build_env): def select_linker(linker, c_compiler, developer_options, build_env, toolchain_flags):
linker = linker[0] if linker else 'other' linker = linker[0] if linker else 'other'
if linker in ('gold', 'bfd', 'other'): if linker in ('gold', 'bfd', 'other'):
return enable_gnu_linker(linker == 'gold', c_compiler, developer_options, build_env, linker) return enable_gnu_linker(linker == 'gold', c_compiler, developer_options,
build_env, toolchain_flags, linker)
if linker == 'lld': if linker == 'lld':
version_check = ['-Wl,--version'] version_check = ['-Wl,--version']
cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags cmd_base = c_compiler.wrapper + [c_compiler.compiler] + c_compiler.flags