зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1512822 - Use clang-cl rather than MSVC for aarch64 builds r=chmanchester
Differential Revision: https://phabricator.services.mozilla.com/D17021 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
90b4b511f2
Коммит
820c1361b4
|
@ -843,10 +843,6 @@ def default_c_compilers(host_or_target, other_c_compiler=None):
|
||||||
def default_c_compilers(host_or_target, target, toolchain_prefix,
|
def default_c_compilers(host_or_target, target, toolchain_prefix,
|
||||||
android_clang_compiler, *other_c_compiler):
|
android_clang_compiler, *other_c_compiler):
|
||||||
if host_or_target.kernel == 'WINNT':
|
if host_or_target.kernel == 'WINNT':
|
||||||
# Prefer MSVC for aarch64 for now.
|
|
||||||
if host_or_target.cpu == 'aarch64':
|
|
||||||
supported = types = ('msvc', 'clang-cl', 'gcc', 'clang')
|
|
||||||
else:
|
|
||||||
supported = types = ('clang-cl', 'msvc', 'gcc', 'clang')
|
supported = types = ('clang-cl', 'msvc', 'gcc', 'clang')
|
||||||
elif host_or_target.kernel == 'Darwin':
|
elif host_or_target.kernel == 'Darwin':
|
||||||
types = ('clang',)
|
types = ('clang',)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
. $topsrcdir/build/win64-aarch64/mozconfig.vs2017
|
. $topsrcdir/build/win64-aarch64/mozconfig.vs2017
|
||||||
|
. "$topsrcdir/build/mozconfig.clang-cl"
|
||||||
|
. "$topsrcdir/build/mozconfig.lld-link"
|
||||||
|
|
|
@ -20,15 +20,7 @@ if [ -d "${VSPATH}" ]; then
|
||||||
|
|
||||||
# We need to declare host and target tools separately.
|
# We need to declare host and target tools separately.
|
||||||
arm_bin="${VSPATH}/VC/bin/Hostx64/arm64"
|
arm_bin="${VSPATH}/VC/bin/Hostx64/arm64"
|
||||||
export CC="${arm_bin}/cl.exe"
|
|
||||||
export CXX="${arm_bin}/cl.exe"
|
|
||||||
export AS="${arm_bin}/armasm64.exe"
|
export AS="${arm_bin}/armasm64.exe"
|
||||||
export LINKER="${arm_bin}/link.exe"
|
|
||||||
|
|
||||||
x64_bin="${VSPATH}/VC/bin/Hostx64/x64"
|
|
||||||
export HOST_CC="${x64_bin}/cl.exe"
|
|
||||||
export HOST_CXX="${x64_bin}/cl.exe"
|
|
||||||
export HOST_LINKER="${x64_bin}/link.exe"
|
|
||||||
|
|
||||||
# We provided LIB, above, but we also need to provide HOST_LDFLAGS so host
|
# We provided LIB, above, but we also need to provide HOST_LDFLAGS so host
|
||||||
# links are not completely confused. LIBPATH wants its argument with
|
# links are not completely confused. LIBPATH wants its argument with
|
||||||
|
|
Загрузка…
Ссылка в новой задаче