From d9caceac2dbc1090357b4a6c20ba32ad4a66844b Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Fri, 3 Nov 2017 14:13:06 +0000 Subject: [PATCH] Bug 1414401 - Enable geckodriver on Linux i686 r=ted,whimboo This patch enables building of geckodriver in CI on Linux i686. MozReview-Commit-ID: GkdHDJrzh2X --HG-- extra : rebase_source : ab4588468939358a41d255dea3a01a8542e35a0e --- toolkit/moz.configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/toolkit/moz.configure b/toolkit/moz.configure index fcf716610bf2..a5fc2b476c2c 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -1114,9 +1114,8 @@ option('--enable-geckodriver', help='Enable WebDriver implementation') 'MOZ_AUTOMATION', compile_environment, cross_compiling, - hazard_analysis, - target) -def geckodriver(enable, automation, compile_env, cross_compile, hazard, target): + hazard_analysis) +def geckodriver(enable, automation, compile_env, cross_compile, hazard): """ geckodriver is implied on supported platforms when MOZ_AUTOMATION is set, but we also provide the --enable-geckodriver option for @@ -1134,8 +1133,7 @@ def geckodriver(enable, automation, compile_env, cross_compile, hazard, target): return True if enable.origin == 'default': - linux32 = target.kernel == 'Linux' and target.cpu == 'x86' - broken_platforms = cross_compile or linux32 or hazard + broken_platforms = cross_compile or hazard if automation and compile_env and not broken_platforms: return True