Bug 1594851 - Run clang-plugin on SM(p) builds on linux r=sfink

Also changes SM(p) to use Clang.

Differential Revision: https://phabricator.services.mozilla.com/D60897

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Matthew Gaudet 2020-01-29 10:22:16 +00:00
Родитель b77ae35a28
Коммит 8901d4de27
2 изменённых файлов: 23 добавлений и 12 удалений

Просмотреть файл

@ -224,6 +224,19 @@ elif platform.system() == 'Windows':
else:
compiler = 'gcc'
# Need a platform name to use as a key in variant files.
if args.platform:
variant_platform = args.platform.split("-")[0]
elif platform.system() == 'Windows':
variant_platform = 'win64' if word_bits == 64 else 'win32'
elif platform.system() == 'Linux':
variant_platform = 'linux64' if word_bits == 64 else 'linux'
elif platform.system() == 'Darwin':
variant_platform = 'macosx64'
else:
variant_platform = 'other'
info("using compiler '{}'".format(compiler))
cxx = {'clang': 'clang++', 'gcc': 'g++', 'cl': 'cl'}.get(compiler)
@ -294,6 +307,12 @@ else:
if platform.system() == 'Linux' and AUTOMATION:
CONFIGURE_ARGS = '--enable-stdcxx-compat --disable-gold ' + CONFIGURE_ARGS
# Override environment variant settings conditionally.
CONFIGURE_ARGS = "{} {}".format(
variant.get('conditional-configure-args', {}).get(variant_platform, ''),
CONFIGURE_ARGS
)
# Timeouts.
ACTIVE_PROCESSES = set()
@ -448,18 +467,6 @@ def normalize_tests(tests):
return tests
# Need a platform name to use as a key in variant files.
if args.platform:
variant_platform = args.platform.split("-")[0]
elif platform.system() == 'Windows':
variant_platform = 'win64' if word_bits == 64 else 'win32'
elif platform.system() == 'Linux':
variant_platform = 'linux64' if word_bits == 64 else 'linux'
elif platform.system() == 'Darwin':
variant_platform = 'macosx64'
else:
variant_platform = 'other'
# Override environment variant settings conditionally.
for k, v in variant.get('conditional-env', {}).get(variant_platform, {}).items():
env[k] = v.format(**REPLACEMENTS)

Просмотреть файл

@ -1,6 +1,7 @@
{
"configure-args": "--enable-rust-simd",
"debug": true,
"compiler": "clang",
"env": {
"JSTESTS_EXTRA_ARGS": "--jitflags=debug"
},
@ -8,5 +9,8 @@
"linux64": {
"JITTEST_EXTRA_ARGS": "--run-binast"
}
},
"conditional-configure-args": {
"linux64": "--enable-clang-plugin"
}
}