Backed out changeset 772250315e76 (
bug 1390524) for build bustage in test_compile_checks.py: compiler_class() takes exactly 2 arguments (1 given). r=backout on a CLOSED TREE
--- a/build/moz.configure/compilers-util.configure
+++ b/build/moz.configure/compilers-util.configure
@@ -2,19 +2,17 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@template
@imports('textwrap')
@imports(_from='mozbuild.configure', _import='SandboxDependsFunction')
-def compiler_class(compiler, host_or_target):
- is_target = host_or_target is target
-
+def compiler_class(compiler):
class Compiler(SandboxDependsFunction):
# Generates a test program and attempts to compile it. In case of
# failure, the resulting check will return None. If the test program
# succeeds, it will return the output of the test program.
# - `includes` are the includes (as file names) that will appear at the
# top of the generated test program.
# - `body` is the code that will appear in the main function of the
# generated test program. `return 0;` is appended to the function
@@ -44,18 +42,17 @@ def compiler_class(compiler, host_or_tar
else:
def checking_fn(fn):
return fn
@depends(self, dependable(flags), extra_toolchain_flags, when=when)
@checking_fn
def func(compiler, flags, extra_flags):
flags = flags or []
- if is_target:
- flags += extra_flags or []
+ flags += extra_flags or []
flags.append('-c')
if try_invoke_compiler(
compiler.wrapper + [compiler.compiler] + compiler.flags,
compiler.language, source, flags,
onerror=onerror) is not None:
return True
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -804,17 +804,17 @@ def compiler(language, host_or_target, c
if language == 'C':
set_config(
'%s_TYPE' % var, valid_compiler.type)
add_old_configure_assignment(
'%s_TYPE' % var, valid_compiler.type)
add_old_configure_assignment(
'%s_VERSION' % var, valid_compiler.version)
- valid_compiler = compiler_class(valid_compiler, host_or_target)
+ valid_compiler = compiler_class(valid_compiler)
def compiler_error():
raise FatalCheckError('Failed compiling a simple %s source with %s'
% (language, what))
valid_compiler.try_compile(check_msg='%s works' % what,
onerror=compiler_error)