--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -771,27 +771,26 @@ def stylo(stylo_config, bindgen_config_p
         (recommended), pass the '--with-libclang-path' and '--with-clang-path'
         options to configure, or put 'llvm-config' in your PATH.  Altering your
         PATH may expose 'clang' as well, potentially altering your compiler,
         which may not be what you intended.'''))
 
     return namespace(
         libclang_path=bindgen_config_paths.libclang_path,
         clang_path=bindgen_config_paths.clang_path,
-        bindgen_enabled=bool(bindgen_enabled),
     )
 
 set_config('MOZ_STYLO', stylo_config.build)
 set_define('MOZ_STYLO', stylo_config.build)
 set_config('MOZ_STYLO_ENABLE', stylo_config.enable)
 set_define('MOZ_STYLO_ENABLE', stylo_config.enable)
 
 set_config('MOZ_LIBCLANG_PATH', stylo.libclang_path)
 set_config('MOZ_CLANG_PATH', stylo.clang_path)
-set_config('MOZ_STYLO_BINDGEN', stylo.bindgen_enabled)
+set_config('MOZ_STYLO_BINDGEN', depends_if('--enable-stylo-build-bindgen')(lambda _: True))
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
        help='Absolute path of the target directory where libgeckoservo can '
             'be found. This is generally servo_src_dir/target/release.')
 
 @depends_if('--with-servo')
 def servo_target_dir(value):
     return value[0]