ce3b8aef99
- separate bootstrap into packages (cleans up template mess) - sync patches from chimera linux (only relevant ones) - drop bootstrap for BE ppc musl targets i don't do anymore - some minor patch updates from ericonr Closes https://github.com/void-linux/void-packages/pull/32555
24 lines
1 KiB
Diff
24 lines
1 KiB
Diff
commit 798e44e67c0bac6509b7915767450b0381c94017
|
|
Author: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Tue Dec 21 00:48:29 2021 +0100
|
|
|
|
do not export LD_LIBRARY_PATH
|
|
|
|
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
|
|
index 0170be967..f7a9ec785 100644
|
|
--- a/src/bootstrap/bootstrap.py
|
|
+++ b/src/bootstrap/bootstrap.py
|
|
@@ -924,12 +924,6 @@ class RustBuild(object):
|
|
del env["CARGO_BUILD_TARGET"]
|
|
env["CARGO_TARGET_DIR"] = build_dir
|
|
env["RUSTC"] = self.rustc(True)
|
|
- env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(True), "lib") + \
|
|
- (os.pathsep + env["LD_LIBRARY_PATH"]) \
|
|
- if "LD_LIBRARY_PATH" in env else ""
|
|
- env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(True), "lib") + \
|
|
- (os.pathsep + env["DYLD_LIBRARY_PATH"]) \
|
|
- if "DYLD_LIBRARY_PATH" in env else ""
|
|
env["LIBRARY_PATH"] = os.path.join(self.bin_root(True), "lib") + \
|
|
(os.pathsep + env["LIBRARY_PATH"]) \
|
|
if "LIBRARY_PATH" in env else ""
|