diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index e9687479ea3..30d6618f19b 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -113,7 +113,7 @@ class MachCommands(CommandBase): if very_verbose: opts += ["-vv"] - env = self.build_env(is_build=True, features=self.features) + env = self.build_env(is_build=True) self.ensure_bootstrapped() self.ensure_clobbered() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 268422fa38f..2b5d47c90bd 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -522,13 +522,14 @@ class CommandBase(object): 'vcdir': vcinstalldir, } - def build_env(self, hosts_file_path=None, is_build=False, test_unit=False, features=None): + def build_env(self, hosts_file_path=None, is_build=False, test_unit=False): """Return an extended environment dictionary.""" env = os.environ.copy() - if not features or "media-dummy" not in features: + if "media-dummy" not in self.features: servo.platform.get().set_gstreamer_environment_variables_if_necessary( - env, cross_compilation_target=self.cross_compile_target) + env, cross_compilation_target=self.cross_compile_target, + check_installation=is_build) if sys.platform == "win32" and type(env['PATH']) == six.text_type: # On win32, the virtualenv's activate_this.py script sometimes ends up |