Bug 1340637 - Disable geckodriver compilation on Linux i686 and macOS; r=me draft
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 24 May 2017 19:45:43 +0100
changeset 584484 0330607a7f59d0482d5de88afc01e35648a56890
parent 584476 00a64f7a1e6d4946ae756886c8cf2a16ef3f12ab
child 630393 23140732d13d2159bfc5389c45e35a73ff2d7764
push id60753
push userbmo:ato@mozilla.com
push dateThu, 25 May 2017 15:05:39 +0000
reviewersme
bugs1340637, 1367519, 1367736
milestone55.0a1
Bug 1340637 - Disable geckodriver compilation on Linux i686 and macOS; r=me geckodriver fails to cross-compile on the TaskCluster x86_64 VMs to Linux i686. This patch disables building on that platform, and I have filed https://bugzilla.mozilla.org/show_bug.cgi?id=1367519 to follow up on this. For other reasons, probably a missing development header, building also fails on macOS. See https://bugzilla.mozilla.org/show_bug.cgi?id=1367736. MozReview-Commit-ID: 7GEx2Oog2fS
toolkit/toolkit.mozbuild
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -149,25 +149,39 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
 DIRS += ['/addon-sdk']
 
 if CONFIG['ENABLE_MARIONETTE']:
     DIRS += [
         '/testing/firefox-ui',
         '/testing/marionette',
     ]
 
+    print "COMPILE_ENVIRONMENT: %s" % CONFIG['COMPILE_ENVIRONMENT']
+    print "CROSS_COMPILE: %s" % CONFIG["CROSS_COMPILE"]
+    print "MOZ_HAZARD: %s" % CONFIG["MOZ_HAZARD"]
+    print "OS_TARGET: %s" % CONFIG["OS_TARGET"]
+    print "TARGET_CPU: %s" % CONFIG["TARGET_CPU"]
+    print "CPU_ARCH: %s" % CONFIG["CPU_ARCH"]
+    print "OS_ARCH: %s" % CONFIG["OS_ARCH"]
+    print "OS_TEST: %s" % CONFIG["OS_TEST"]
+
     # Disable building of geckodriver for artifact builds and in
     # environments where cross compiling occurs (macOS and Android),
-    # and on hazard builds.
+    # on hazard builds, on Linux x86 (linking problems), and macOS
+    # (missing libraries).
     #
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1341041
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1329737
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1367519
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1367736
     if CONFIG['COMPILE_ENVIRONMENT'] and \
             not CONFIG['CROSS_COMPILE'] and \
-            not CONFIG['MOZ_HAZARD']:
+            not CONFIG['MOZ_HAZARD'] or \
+            CONFIG['OS_TARGET'] != 'Darwin' or \
+            (CONFIG['OS_TARGET'] != 'Linux' and not CONFIG['TARGET_CPU'].endswith('x86')):
         DIRS += ['/testing/geckodriver']
 
 DIRS += [
     '/tools/quitter',
     '/media/gmp-clearkey/0.1',
 ]
 
 if CONFIG['ENABLE_TESTS']: