Skip to content

Commit

Permalink
Auto merge of #24392 - ferjm:uwp.no.system.gst, r=Manishearth
Browse files Browse the repository at this point in the history
Allow building and cleaning for UWP without system GStreamer

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24392)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 8, 2019
2 parents a7d48dc + becb694 commit 9c3e4a7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions python/servo/command_base.py
Expand Up @@ -558,7 +558,9 @@ def get_nightly_binary_path(self, nightly_date):

return self.get_executable(destination_folder)

def needs_gstreamer_env(self, target, env):
def needs_gstreamer_env(self, target, env, uwp=False):
if uwp:
return False
try:
if check_gstreamer_lib():
return False
Expand Down Expand Up @@ -663,7 +665,7 @@ def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit
# Always build harfbuzz from source
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"

if self.needs_gstreamer_env(target or host_triple(), env):
if is_build and self.needs_gstreamer_env(target or host_triple(), env, uwp):
gstpath = gstreamer_root(target or host_triple(), env, self.get_top_dir())
extra_path += [path.join(gstpath, "bin")]
libpath = path.join(gstpath, "lib")
Expand Down

0 comments on commit 9c3e4a7

Please sign in to comment.