diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-06-24 17:02:23 +0200 |
|---|---|---|
| committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-06-24 17:46:24 +0200 |
| commit | e68b4e5fad1a4632086223a72122b460ca9f795b (patch) | |
| tree | daa0b61e1eab27de9848babe762e6887c72180bf /python | |
| parent | a2b195aff81d7945243947df5ab1a973baf5c91e (diff) | |
| download | servo-e68b4e5fad1a4632086223a72122b460ca9f795b.tar.gz servo-e68b4e5fad1a4632086223a72122b460ca9f795b.zip | |
build: Cleanup some path-munging code.
I was looking at this today, and this seems better than the pre-existing code,
generally pre-pending to these paths isn't great...
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d39576fe9c9..0b7ed2cf50b 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -211,7 +211,7 @@ def append_to_path_env(string, env, name): if name in env: variable = env[name] if len(variable) > 0: - variable += ":" + variable += os.pathsep variable += string env[name] = variable @@ -641,7 +641,7 @@ install them, let us know by filing a bug!") env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" if extra_path: - env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"]) + append_to_path_env(os.pathsep.join(extra_path), env, "PATH") if self.config["build"]["incremental"]: env["CARGO_INCREMENTAL"] = "1" @@ -649,16 +649,8 @@ install them, let us know by filing a bug!") env["CARGO_INCREMENTAL"] = "0" if extra_lib: - if sys.platform == "darwin": - env["DYLD_LIBRARY_PATH"] = "%s%s%s" % \ - (os.pathsep.join(extra_lib), - os.pathsep, - env.get("DYLD_LIBRARY_PATH", "")) - else: - env["LD_LIBRARY_PATH"] = "%s%s%s" % \ - (os.pathsep.join(extra_lib), - os.pathsep, - env.get("LD_LIBRARY_PATH", "")) + path_var = "DYLD_LIBRARY_PATH" if sys.platform == "darwin" else "LD_LIBRARY_PATH" + append_to_path_env(os.pathsep.join(extra_lib), env, path_var) # Paths to Android build tools: if self.config["android"]["sdk"]: |