diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2019-11-05 20:56:48 +0000 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2019-11-21 20:08:01 +0000 |
| commit | a3ef5944704831b3d1d21b7271940521ce50e4c7 (patch) | |
| tree | fc5e8acdde0728f9d2975cc1467029e85e3e032c /python/servo | |
| parent | 4e3f164f7bd020b1aed453ec11586cafd84e1a5d (diff) | |
| download | servo-a3ef5944704831b3d1d21b7271940521ce50e4c7.tar.gz servo-a3ef5944704831b3d1d21b7271940521ce50e4c7.zip | |
Pass feature list to build_env()
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index fc5cf912a52..6ceb6f9574a 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -260,7 +260,7 @@ class MachCommands(CommandBase): check_call(["rustup" + BIN_SUFFIX, "target", "add", "--toolchain", self.toolchain(), target]) - env = self.build_env(target=target, is_build=True, uwp=uwp) + env = self.build_env(target=target, is_build=True, uwp=uwp, features=features) self.ensure_bootstrapped(target=target) self.ensure_clobbered() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2a82ec51612..c3119d5cfd3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -562,9 +562,11 @@ class CommandBase(object): return self.get_executable(destination_folder) - def needs_gstreamer_env(self, target, env, uwp=False): + def needs_gstreamer_env(self, target, env, uwp=False, features=None): if uwp: return False + if "media-dummy" in features: + return False try: if check_gstreamer_lib(): return False @@ -620,7 +622,7 @@ install them, let us know by filing a bug!") 'vcdir': vcinstalldir, } - def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False): + def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False, features=None): """Return an extended environment dictionary.""" env = os.environ.copy() if sys.platform == "win32" and type(env['PATH']) == unicode: @@ -670,7 +672,7 @@ install them, let us know by filing a bug!") # Always build harfbuzz from source env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" - if is_build and self.needs_gstreamer_env(target or host_triple(), env, uwp): + if is_build and self.needs_gstreamer_env(target or host_triple(), env, uwp, features): gstpath = gstreamer_root(target or host_triple(), env, self.get_top_dir()) extra_path += [path.join(gstpath, "bin")] libpath = path.join(gstpath, "lib") |