summaryrefslogtreecommitdiff
path: root/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch')
-rw-r--r--user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch60
1 files changed, 30 insertions, 30 deletions
diff --git a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index eda99398c..2c8d75872 100644
--- a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -1,7 +1,7 @@
-From 1b47e0a7cfc3fd6572d939aa894e3a23522ed4c0 Mon Sep 17 00:00:00 2001
+From ff1c6e9d50da8247f044b10d281f336c2c859f7c Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 8 Sep 2017 22:11:14 -0500
-Subject: [PATCH 05/29] Remove -nostdlib and musl_root from musl targets
+Subject: [PATCH 05/24] Remove -nostdlib and musl_root from musl targets
---
config.toml.example | 6 ---
@@ -19,10 +19,10 @@ Subject: [PATCH 05/29] Remove -nostdlib and musl_root from musl targets
12 files changed, 4 insertions(+), 188 deletions(-)
diff --git a/config.toml.example b/config.toml.example
-index 9907341633..6f8b52e235 100644
+index 3159c19528..a86db62c7b 100644
--- a/config.toml.example
+++ b/config.toml.example
-@@ -409,12 +409,6 @@
+@@ -431,12 +431,6 @@
# only use static libraries. If unset, the target's default linkage is used.
#crt-static = false
@@ -36,7 +36,7 @@ index 9907341633..6f8b52e235 100644
# probably don't want to use this.
#qemu-rootfs = "..."
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index 7192cae895..71435f9306 100644
+index b89976eca2..0838130039 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -30,7 +30,6 @@
@@ -64,7 +64,7 @@ index 7192cae895..71435f9306 100644
if let Ok(target_linker) = env::var("RUSTC_TARGET_LINKER") {
cmd.arg(format!("-Clinker={}", target_linker));
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index 698903f128..629cedf019 100644
+index d5da0cabec..47cc31bded 100644
--- a/src/bootstrap/cc_detect.rs
+++ b/src/bootstrap/cc_detect.rs
@@ -95,7 +95,7 @@ pub fn find(build: &mut Build) {
@@ -123,10 +123,10 @@ index 698903f128..629cedf019 100644
}
}
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 04e8e133b0..7767956cd8 100644
+index 608f2c982c..fea4c7ff72 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
-@@ -87,13 +87,6 @@ impl Step for Std {
+@@ -86,13 +86,6 @@ impl Step for Std {
});
builder.info(&format!("Uplifting stage1 std ({} -> {})", from.host, target));
@@ -140,7 +140,7 @@ index 04e8e133b0..7767956cd8 100644
builder.ensure(StdLink {
compiler: from,
target_compiler: compiler,
-@@ -102,11 +95,6 @@ impl Step for Std {
+@@ -101,11 +94,6 @@ impl Step for Std {
return;
}
@@ -149,10 +149,10 @@ index 04e8e133b0..7767956cd8 100644
- copy_musl_third_party_objects(builder, target, &libdir);
- }
-
- let out_dir = builder.cargo_out(compiler, Mode::Std, target);
- builder.clear_if_dirty(&out_dir, &builder.rustc(compiler));
let mut cargo = builder.cargo(compiler, Mode::Std, target, "build");
-@@ -128,20 +116,6 @@ impl Step for Std {
+ std_cargo(builder, &compiler, target, &mut cargo);
+
+@@ -126,20 +114,6 @@ impl Step for Std {
}
}
@@ -173,7 +173,7 @@ index 04e8e133b0..7767956cd8 100644
/// Configure cargo to compile the standard library, adding appropriate env vars
/// and such.
pub fn std_cargo(builder: &Builder,
-@@ -196,11 +170,6 @@ pub fn std_cargo(builder: &Builder,
+@@ -193,11 +167,6 @@ pub fn std_cargo(builder: &Builder,
cargo.env("JEMALLOC_OVERRIDE", jemalloc);
}
}
@@ -186,10 +186,10 @@ index 04e8e133b0..7767956cd8 100644
}
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 0a8a5c87d0..9fdf8690c5 100644
+index cc6d76c76f..db53d09922 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
-@@ -131,8 +131,6 @@ pub struct Config {
+@@ -135,8 +135,6 @@ pub struct Config {
pub save_toolstates: Option<PathBuf>,
pub print_step_timings: bool,
@@ -198,7 +198,7 @@ index 0a8a5c87d0..9fdf8690c5 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -165,7 +163,6 @@ pub struct Target {
+@@ -170,7 +168,6 @@ pub struct Target {
pub linker: Option<PathBuf>,
pub ndk: Option<PathBuf>,
pub crt_static: Option<bool>,
@@ -206,7 +206,7 @@ index 0a8a5c87d0..9fdf8690c5 100644
pub qemu_rootfs: Option<PathBuf>,
pub no_std: bool,
}
-@@ -294,7 +291,6 @@ struct Rust {
+@@ -301,7 +298,6 @@ struct Rust {
backtrace: Option<bool>,
default_linker: Option<String>,
channel: Option<String>,
@@ -214,7 +214,7 @@ index 0a8a5c87d0..9fdf8690c5 100644
rpath: Option<bool>,
optimize_tests: Option<bool>,
debuginfo_tests: Option<bool>,
-@@ -328,7 +324,6 @@ struct TomlTarget {
+@@ -338,7 +334,6 @@ struct TomlTarget {
linker: Option<String>,
android_ndk: Option<String>,
crt_static: Option<bool>,
@@ -222,7 +222,7 @@ index 0a8a5c87d0..9fdf8690c5 100644
qemu_rootfs: Option<String>,
}
-@@ -541,7 +536,6 @@ impl Config {
+@@ -554,7 +549,6 @@ impl Config {
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
config.rustc_default_linker = rust.default_linker.clone();
@@ -230,8 +230,8 @@ index 0a8a5c87d0..9fdf8690c5 100644
config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings));
set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -580,7 +574,6 @@ impl Config {
- target.ar = cfg.ar.clone().map(PathBuf::from);
+@@ -595,7 +589,6 @@ impl Config {
+ target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
target.linker = cfg.linker.clone().map(PathBuf::from);
target.crt_static = cfg.crt_static.clone();
- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
@@ -239,10 +239,10 @@ index 0a8a5c87d0..9fdf8690c5 100644
config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 9fdba044f4..513935e4c8 100755
+index cf7f78eeba..70bc0f5a41 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
-@@ -108,28 +108,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -109,28 +109,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
"aarch64-linux-android NDK standalone path")
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
"x86_64-linux-android NDK standalone path")
@@ -272,10 +272,10 @@ index 9fdba044f4..513935e4c8 100755
"rootfs in qemu testing, you probably don't want to use this")
v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index e6ac847afe..dd785124d2 100644
+index 055a87efaa..5eb339ee00 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
-@@ -803,14 +803,6 @@ impl Build {
+@@ -848,14 +848,6 @@ impl Build {
}
}
@@ -291,7 +291,7 @@ index e6ac847afe..dd785124d2 100644
fn no_std(&self, target: Interned<String>) -> Option<bool> {
self.config.target_config.get(&target)
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index c7f514da93..617a3c2399 100644
+index c2610de23b..24e05e4250 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -21,7 +21,7 @@
@@ -313,7 +313,7 @@ index c7f514da93..617a3c2399 100644
- // fall back to the system toolchain in /usr before giving up
- if build.musl_root(*target).is_none() && build.config.build == *target {
- let target = build.config.target_config.entry(target.clone())
-- .or_insert(Default::default());
+- .or_default();
- target.musl_root = Some("/usr".into());
- }
- match build.musl_root(*target) {
@@ -352,11 +352,11 @@ index ba2d32a929..412c37fdd1 100644
--disable-docs
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
-index 6302f55009..e04fdaa226 100644
+index e2484b7224..1855b7f3e5 100644
--- a/src/ci/docker/dist-various-1/Dockerfile
+++ b/src/ci/docker/dist-various-1/Dockerfile
-@@ -109,13 +109,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
- CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc
+@@ -116,13 +116,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
+ CC_armebv7r_none_eabi=arm-none-eabi-gcc
ENV RUST_CONFIGURE_ARGS \
- --musl-root-armv5te=/musl-armv5te \
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 03:24:27 +0000