зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1745129 - Use `--gcc-toolchain=...` rather than `-gcc-toolchain ...`. r=firefox-build-system-reviewers,andi
Apparently the latter doesn't work anymore with clang 14. Differential Revision: https://phabricator.services.mozilla.com/D133330
This commit is contained in:
Родитель
ec5f85f981
Коммит
c60168e1b6
|
@ -12,7 +12,7 @@ case "$target" in
|
|||
|
||||
# clang will do any number of interesting things with host tools unless we tell
|
||||
# it to use the NDK tools.
|
||||
extra_opts="-gcc-toolchain $(dirname $(dirname $TOOLCHAIN_PREFIX))"
|
||||
extra_opts="--gcc-toolchain=$(dirname $(dirname $TOOLCHAIN_PREFIX))"
|
||||
CPPFLAGS="$extra_opts -D__ANDROID_API__=$android_version $CPPFLAGS"
|
||||
ASFLAGS="$extra_opts $ASFLAGS"
|
||||
LDFLAGS="$extra_opts $LDFLAGS"
|
||||
|
|
|
@ -376,8 +376,7 @@ def extra_toolchain_flags(
|
|||
android_system,
|
||||
"-isystem",
|
||||
os.path.join(android_sysroot, "usr", "include"),
|
||||
"-gcc-toolchain",
|
||||
toolchain_dir,
|
||||
"--gcc-toolchain={}".format(toolchain_dir),
|
||||
"-D__ANDROID_API__=%d" % android_version,
|
||||
]
|
||||
return flags
|
||||
|
|
Загрузка…
Ссылка в новой задаче