45e2c3bd44
Removed dmraid, iniparser, jam, libatasmart, libblockdev, libbytesize, libyaml, mozjs, ndctl, polkit, rpi-userland, sccache from base
Removed docdir, sysconfdir and prefix quotes from autoconf build option and similar options from various packages in base
Added apparch variables to base/{acpid,dmidecode,gnu-efi,pciutils,syslinux}
Added udev rules build option to base/alsa-utils
Discarded --offline option in base/cbindgen
Upgraded base/cmake to 3.26.4
Added --without-x build option to base/dialog
Upgraded base/gawk to 5.2.2
Upgraded base/glib to 2.76.3
Disabled tests and examples in base/gloox
Upgraded base/gnupg2 to 2.2.41
Upgraded base/gnutls to 3.8.0
Upgraded base/gpgme to 1.20.0
Fixed make command option ordering in base/{hdparm,p7zip}
Upgraded base/libgpg-error to 1.47
Upgraded base/libjpeg-turbo to 2.1.5.1
Upgraded base/libuv to 1.45.0
Discarded some build options to base/libxml2
Upgraded base/llvm to 15.0.7
Fixed subshell code in base/lua53
Removed --prefix= in several python package build files, added /usr as prefix in base/python3
Upgraded base/musl to 1.2.4
Upgraded base/nettle to 3.9
Upgraded base/nghttp2 to 1.53.0
Added --without-trust-paths to base/p11-kit
Upgraded base/qpdf to 11.4.0
Discarded base/rpi-userland
Upgraded base/rust to 1.69.0
Upgraded base/sqlite to 3420000
Added $CFLAGS to base/unzip
Added -fPIC option to base/yasm
Updated base build list
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 236c0272667d69380d03984cfa8bad44b033fd69 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Tue, 21 Dec 2021 02:46:30 +0100
|
|
Subject: [PATCH 13/15] allow specifying native sysroot to use for linkage
|
|
|
|
This allows us to get around the linker attempting to use
|
|
incompatible libs.
|
|
---
|
|
src/bootstrap/builder.rs | 4 ++++
|
|
src/bootstrap/config.rs | 3 +++
|
|
src/bootstrap/lib.rs | 4 ++++
|
|
3 files changed, 11 insertions(+)
|
|
|
|
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
|
index 6a02a225c..483aa8818 100644
|
|
--- a/src/bootstrap/builder.rs
|
|
+++ b/src/bootstrap/builder.rs
|
|
@@ -1708,6 +1708,10 @@ impl<'a> Builder<'a> {
|
|
}
|
|
}
|
|
|
|
+ if let Some(sysroot) = self.native_sysroot(target) {
|
|
+ rustflags.arg(&format!("-Clink-args=--sysroot={}", sysroot.display()));
|
|
+ }
|
|
+
|
|
if let Some(host_linker) = self.linker(compiler.host) {
|
|
cargo.env("RUSTC_HOST_LINKER", host_linker);
|
|
}
|
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
|
index 18a764689..f8b9bbd96 100644
|
|
--- a/src/bootstrap/config.rs
|
|
+++ b/src/bootstrap/config.rs
|
|
@@ -395,6 +395,7 @@ pub struct Target {
|
|
pub ranlib: Option<PathBuf>,
|
|
pub default_linker: Option<PathBuf>,
|
|
pub linker: Option<PathBuf>,
|
|
+ pub sysroot: Option<PathBuf>,
|
|
pub ndk: Option<PathBuf>,
|
|
pub sanitizers: Option<bool>,
|
|
pub profiler: Option<bool>,
|
|
@@ -723,6 +724,7 @@ define_config! {
|
|
ranlib: Option<String> = "ranlib",
|
|
default_linker: Option<PathBuf> = "default-linker",
|
|
linker: Option<String> = "linker",
|
|
+ sysroot: Option<String> = "sysroot",
|
|
llvm_config: Option<String> = "llvm-config",
|
|
llvm_filecheck: Option<String> = "llvm-filecheck",
|
|
llvm_libunwind: Option<String> = "llvm-libunwind",
|
|
@@ -1156,6 +1158,7 @@ impl Config {
|
|
target.ar = cfg.ar.map(PathBuf::from);
|
|
target.ranlib = cfg.ranlib.map(PathBuf::from);
|
|
target.linker = cfg.linker.map(PathBuf::from);
|
|
+ target.sysroot = cfg.sysroot.map(PathBuf::from);
|
|
target.crt_static = cfg.crt_static;
|
|
target.wasi_root = cfg.wasi_root.map(PathBuf::from);
|
|
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
|
|
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
|
|
index 0a7012dbd..cded50d20 100644
|
|
--- a/src/bootstrap/lib.rs
|
|
+++ b/src/bootstrap/lib.rs
|
|
@@ -1152,6 +1152,10 @@ impl Build {
|
|
self.config.target_config.get(&target).and_then(|t| t.crt_static)
|
|
}
|
|
}
|
|
+
|
|
+ fn native_sysroot(&self, target: TargetSelection) -> Option<&Path> {
|
|
+ self.config.target_config.get(&target).and_then(|c| c.sysroot.as_ref()).map(|p| &**p)
|
|
+ }
|
|
|
|
/// Returns the sysroot for the wasi target, if defined
|
|
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
|
|
--
|
|
2.37.2
|
|
|