mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 14:56:46 +02:00
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html * base.crt_static_default from linux_musl.rs in musl-fix-linux_musl_base.patch, was moved to the indivdual targets (which we already do in alpine-target.patch)9c37c14aa2
* Target JSON (de)serialization was moved from compiler/rustc_target/src/spec/mod.rs to compiler/rustc_target/src/spec/json.rs (need-rpath.patch)77080d8eb3
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
Patch-Source: https://github.com/chimera-linux/cports/blob/ef79b3bef872aa389cfaaa14b99bb3ab851def2e/main/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
|
|
(rebased)
|
|
---
|
|
From ba681a7679007c716d9500f639d87c0496acf304 Mon Sep 17 00:00:00 2001
|
|
From: q66 <q66@chimera-linux.org>
|
|
Date: Fri, 25 Feb 2022 00:39:21 +0100
|
|
Subject: [PATCH 10/13] do not export LD_LIBRARY_PATH
|
|
|
|
---
|
|
src/bootstrap/bootstrap.py | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
|
|
index 01a9792f1b3..f618741e656 100644
|
|
--- a/src/bootstrap/bootstrap.py
|
|
+++ b/src/bootstrap/bootstrap.py
|
|
@@ -1023,17 +1023,6 @@ class RustBuild(object):
|
|
del env["CARGO_BUILD_TARGET"]
|
|
env["CARGO_TARGET_DIR"] = build_dir
|
|
env["RUSTC"] = self.rustc()
|
|
- env["LD_LIBRARY_PATH"] = (
|
|
- os.path.join(self.bin_root(), "lib") + (os.pathsep + env["LD_LIBRARY_PATH"])
|
|
- if "LD_LIBRARY_PATH" in env
|
|
- else ""
|
|
- )
|
|
- env["DYLD_LIBRARY_PATH"] = (
|
|
- os.path.join(self.bin_root(), "lib")
|
|
- + (os.pathsep + env["DYLD_LIBRARY_PATH"])
|
|
- if "DYLD_LIBRARY_PATH" in env
|
|
- else ""
|
|
- )
|
|
env["LIBRARY_PATH"] = (
|
|
os.path.join(self.bin_root(), "lib") + (os.pathsep + env["LIBRARY_PATH"])
|
|
if "LIBRARY_PATH" in env
|
|
--
|
|
2.47.1
|