projects/aports·blob master · refs

28 lines · 1.2 KiB

1From ee7546e4d5dd773d8490dc6f254c828a60a26aec Mon Sep 17 00:00:00 2001
2From: q66 <[email protected]>
3Date: Fri, 25 Feb 2022 00:39:21 +0100
4Subject: [PATCH 08/10] do not export LD_LIBRARY_PATH
5
6Patch-Source: https://github.com/chimera-linux/cports/blob/ef79b3bef872aa389cfaaa14b99bb3ab851def2e/main/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
7(rebased)
8
9--- a/src/bootstrap/bootstrap.py
10+++ b/src/bootstrap/bootstrap.py
11@@ -1078,17 +1078,6 @@ class RustBuild(object):
12 env["CARGO_INCREMENTAL"] = "0"
13 env["CARGO_TARGET_DIR"] = build_dir
14 env["RUSTC"] = self.rustc()
15- env["LD_LIBRARY_PATH"] = (
16- os.path.join(self.bin_root(), "lib") + (os.pathsep + env["LD_LIBRARY_PATH"])
17- if "LD_LIBRARY_PATH" in env
18- else ""
19- )
20- env["DYLD_LIBRARY_PATH"] = (
21- os.path.join(self.bin_root(), "lib")
22- + (os.pathsep + env["DYLD_LIBRARY_PATH"])
23- if "DYLD_LIBRARY_PATH" in env
24- else ""
25- )
26 env["LIBRARY_PATH"] = (
27 os.path.join(self.bin_root(), "lib") + (os.pathsep + env["LIBRARY_PATH"])
28 if "LIBRARY_PATH" in env