# HG changeset patch # User Mike Hommey # Date 1548724549 0 # Tue Jan 29 01:15:49 2019 +0000 # Node ID e1c6f99be2e529d7997e60e67b61ba9039cce568 # Parent d91edd8b39e3d6fd7f62e811d411ee02f67d30cc Bug 1523143 - Remove --host configure flags from autospider builds. r=chmanchester --host is autodetected and may not actually be what the currently given values are. Differential Revision: https://phabricator.services.mozilla.com/D17765 diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py --- a/js/src/devtools/automation/autospider.py +++ b/js/src/devtools/automation/autospider.py @@ -251,32 +251,32 @@ elif platform.system() == 'Windows': os.environ['USE_64BIT'] = '1' set_vars_from_script(posixpath.join(PDIR.scripts, 'winbuildenv.sh'), ['PATH', 'INCLUDE', 'LIB', 'LIBPATH', 'CC', 'CXX', 'WINDOWSSDKDIR']) # Configure flags, based on word length and cross-compilation if word_bits == 32: if platform.system() == 'Windows': - CONFIGURE_ARGS += ' --target=i686-pc-mingw32 --host=i686-pc-mingw32' + CONFIGURE_ARGS += ' --target=i686-pc-mingw32' elif platform.system() == 'Linux': if not platform.machine().startswith('arm'): - CONFIGURE_ARGS += ' --target=i686-pc-linux --host=i686-pc-linux' + CONFIGURE_ARGS += ' --target=i686-pc-linux' # Add SSE2 support for x86/x64 architectures. if not platform.machine().startswith('arm'): if platform.system() == 'Windows': sse_flags = '-arch:SSE2' else: sse_flags = '-msse -msse2 -mfpmath=sse' env['CCFLAGS'] = '{0} {1}'.format(env.get('CCFLAGS', ''), sse_flags) env['CXXFLAGS'] = '{0} {1}'.format(env.get('CXXFLAGS', ''), sse_flags) else: if platform.system() == 'Windows': - CONFIGURE_ARGS += ' --target=x86_64-pc-mingw32 --host=x86_64-pc-mingw32' + CONFIGURE_ARGS += ' --target=x86_64-pc-mingw32' if platform.system() == 'Linux': CONFIGURE_ARGS += ' --enable-stdcxx-compat' # Timeouts. ACTIVE_PROCESSES = set() diff --git a/js/src/devtools/automation/variants/arm-sim b/js/src/devtools/automation/variants/arm-sim --- a/js/src/devtools/automation/variants/arm-sim +++ b/js/src/devtools/automation/variants/arm-sim @@ -1,7 +1,7 @@ { - "configure-args": "--enable-simulator=arm --target=i686-pc-linux --host=i686-pc-linux", + "configure-args": "--enable-simulator=arm --target=i686-pc-linux", "optimize": true, "debug": true, "bits": 32, "use_minidump": false } diff --git a/js/src/devtools/automation/variants/arm-sim-osx b/js/src/devtools/automation/variants/arm-sim-osx --- a/js/src/devtools/automation/variants/arm-sim-osx +++ b/js/src/devtools/automation/variants/arm-sim-osx @@ -1,6 +1,6 @@ { - "configure-args": "--enable-simulator=arm --target=i686-apple-darwin10.0.0 --host=i686-apple-darwin10.0.0", + "configure-args": "--enable-simulator=arm --target=i686-apple-darwin10.0.0", "optimize": true, "debug": true, "bits": 32 }