Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 19:13:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

build: Cleanup some path-munging code.

Browse source 
I was looking at this today, and this seems better than the pre-existing code,
generally pre-pending to these paths isn't great...
This commit is contained in:
Emilio Cobos Álvarez 2019-06-24 17:02:23 +02:00
parent a2b195aff8
commit e68b4e5fad
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python/servo/command_base.py
View file

@ -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"]: