ryan-distrust.co/stagex
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: remove glibc rustlib patch

Browse source
This commit is contained in:
Lance R. Vick 2024-10-20 17:45:28 -07:00
parent 459c0a2860
commit a160034f20
No known key found for this signature in database
GPG key ID: 8E47A1EC35A1551D
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/cross-x86_64-gnu-rust/Containerfile
View file

@ -33,7 +33,6 @@ ADD *.patch .
RUN <<EOF
set -eux
PREFIX=/rust-${VERSION}/usr
patch -p1 ../glibc.patch
./configure \
--build="x86_64-unknown-linux-musl" \
--host="x86_64-unknown-linux-musl" \
@ -52,8 +51,6 @@ RUN <<EOF
--sysconfdir="/rootfs/etc" \
--libdir="/opt/cross/lib/x86_64-linux-gnu" \
--set="install.prefix=/rootfs" \
--set="rust.musl-root=/usr" \
--set="target.x86_64-unknown-linux-gnu.musl-libdir=/opt/cross/lib/x86_64-linux-gnu" \
--set="target.x86_64-unknown-linux-gnu.llvm-config=/usr/bin/llvm-config" \
--set="target.x86_64-unknown-linux-gnu.cc=x86_64-linux-gnu-gcc" \
--set="target.x86_64-unknown-linux-gnu.cxx=x86_64-linux-gnu-c++" \
@ -67,8 +64,7 @@ RUN <<EOF
--set="rust.parallel-compiler=false" \
--set="rust.remap-debuginfo=true" \
--set="rust.llvm-libunwind=in-tree" \
--set="build.full-bootstrap=true" \
--set="build.full-bootstrap=true"
python3 x.py build --stage 0 --target x86_64-unknown-linux-gnu library
EOF

19
packages/cross-x86_64-gnu-rust/glibc.patch
View file

@ -1,19 +0,0 @@
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index df4d1a43dab..17bb8bf9659 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -438,12 +438,12 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
// Help the libc crate compile by assisting it in finding various
// sysroot native libraries.
- if target.contains("musl") {
+ //if target.contains("musl") {
if let Some(p) = builder.musl_libdir(target) {
let root = format!("native={}", p.to_str().unwrap());
cargo.rustflag("-L").rustflag(&root);
}
- }
+ //}
if target.contains("-wasi") {
if let Some(p) = builder.wasi_root(target) {