diff options
author | Fernando Jimenez Moreno <ferjmoreno@gmail.com> | 2019-08-19 18:08:34 +0200 |
---|---|---|
committer | Fernando Jimenez Moreno <ferjmoreno@gmail.com> | 2019-08-20 08:47:35 +0200 |
commit | 72e28dffcdf560543d312abc0ec4ff76b7c7dfaf (patch) | |
tree | ac832d1e2bc3529a5ca166b07b907461da6b00a6 /python/servo/build_commands.py | |
parent | 00a9f307733fa98cea8160e96d404bce9a871c09 (diff) | |
download | servo-72e28dffcdf560543d312abc0ec4ff76b7c7dfaf.tar.gz servo-72e28dffcdf560543d312abc0ec4ff76b7c7dfaf.zip |
Do not require setting PKG_CONFIG_PATH on Windows
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r-- | python/servo/build_commands.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index dbd5e2d905c..4aa72a457fc 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -30,7 +30,7 @@ from mach.decorators import ( from mach.registrar import Registrar from mach_bootstrap import _get_exec_path -from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX, append_to_path_env +from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX, append_to_path_env, gstreamer_root from servo.util import host_triple @@ -776,23 +776,6 @@ class MachCommands(CommandBase): return True -def gstreamer_root(target, env): - arch = { - "x86_64": "X86_64", - "x86": "X86", - "aarch64": "ARM64", - } - gst_x64 = arch[target.split('-')[0]] - gst_default_path = path.join("C:\\gstreamer\\1.0", gst_x64) - gst_env = "GSTREAMER_1_0_ROOT_" + gst_x64 - if env.get(gst_env) is not None: - return env.get(gst_env) - elif os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): - return gst_default_path - else: - return None - - def package_gstreamer_dlls(env, servo_exe_dir, target, uwp): gst_root = gstreamer_root(target, env) if not gst_root: |