diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-09-07 14:42:19 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-09-11 19:34:38 +0530 |
| commit | a380c5fd6e5e9eb2e6c54a77ce3d88f30dc4089d (patch) | |
| tree | d5b1469e1e6916d7951419dcc369605b81d79ab4 /python/servo/command_base.py | |
| parent | d3ece2bc494103ecbd619327abd8f751a29a5c34 (diff) | |
| download | servo-a380c5fd6e5e9eb2e6c54a77ce3d88f30dc4089d.tar.gz servo-a380c5fd6e5e9eb2e6c54a77ce3d88f30dc4089d.zip | |
Don't try to load gstreamer on non-x86
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index fa224763a0e..57865bac55d 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -483,20 +483,19 @@ class CommandBase(object): def needs_gstreamer_env(self, target): if check_gstreamer_lib(): return False - gstpath = self.get_gstreamer_path() + if "x86_64" not in (target or host_triple()): + # We don't build gstreamer for non-x86_64 yet + return False if sys.platform == "linux2": - if "x86_64" not in (target or host_triple()): - raise Exception("We don't currently support using local gstreamer builds \ - for non-x86_64, please file a bug") - if path.isdir(gstpath): + if path.isdir(self.get_gstreamer_path()): return True else: raise Exception("Your system's gstreamer libraries are out of date \ - (we need at least 1.12). Please run ./mach bootstrap-gstreamer") +(we need at least 1.12). Please run ./mach bootstrap-gstreamer") else: raise Exception("Your system's gstreamer libraries are out of date \ - (we need at least 1.12). If you're unable to \ - install them, let us know by filing a bug!") +(we need at least 1.12). If you're unable to \ +install them, let us know by filing a bug!") return False def set_run_env(self): |