--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -898,17 +898,17 @@ set_config('MOZ_CONFIGURE_OPTIONS', all_
 
 # This is temporary until js/src/configure and configure are merged.
 # Use instead of option() in js/moz.configure and more generally, for
 # options that are shared between configure and js/src/configure.
 @template
 def js_option(*args, **kwargs):
     opt = option(*args, **kwargs)
 
-    @depends(opt.option, build_project)
+    @depends(opt.option, build_project, when=kwargs.get('when'))
     def js_option(value, build_project):
         if build_project != 'js':
             return value.format(opt.option)
 
     add_old_configure_arg(js_option)
 
 
 # Bug 1278542: This function is a workaround to resolve