Bug 1340637 - Skip geckodriver in hazard builds; r?ted
One of the Rust crates that is built as part of geckodriver's dependency
chain uses a build script to compile some C code.
Because mozbuild does not yet pass the compiler wrapper down to where
the gcc crate can find it, we need to avoid building on geckodriver when
this is the case.
MozReview-Commit-ID: GCDedvL515S
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -159,24 +159,25 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
DIRS += ['/addon-sdk']
if CONFIG['ENABLE_MARIONETTE']:
DIRS += [
'/testing/firefox-ui',
'/testing/marionette',
]
- # Disable building of geckodriver for artifact build, macOS,
- # and Android.
+ # Disable building of geckodriver for artifact builds, macOS,
+ # Android, and Hazard builds.
#
# https://bugzilla.mozilla.org/show_bug.cgi?id=1341041
# https://bugzilla.mozilla.org/show_bug.cgi?id=1329737
if CONFIG['COMPILE_ENVIRONMENT'] and \
CONFIG['OS_ARCH'] != 'Darwin' and \
- CONFIG['OS_TARGET'] != 'Android':
+ CONFIG['OS_TARGET'] != 'Android' and \
+ not CONFIG['MOZ_HAZARD']:
DIRS += ['/testing/geckodriver']
DIRS += [
'/tools/quitter',
'/media/gmp-clearkey/0.1',
]
if CONFIG['ENABLE_TESTS']: