mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-25 11:22:30 +01:00
507c0e0b6d
- drop need-rpath.patch - make it clear that it is our *rust* version, mainly for output from cargo --version - move target-spec-json-schema.json to -doc subpackage, we do not want to introduce a /usr/etc here (rustc --print sysroot), there is also rustc --print target-spec-json-schema - skip two bootstrap sanity checks - initially I just disabled these to see how far we would get, but it seems like we can build just fine without these (also tested with a few rust aports)
25 lines
867 B
Diff
25 lines
867 B
Diff
--- a/src/etc/rust-gdb
|
|
+++ b/src/etc/rust-gdb
|
|
@@ -12,7 +12,7 @@ fi
|
|
|
|
# Find out where the pretty printer Python module is
|
|
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
|
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
|
+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc"
|
|
# Get the commit hash for path remapping
|
|
RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
|
|
|
|
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
|
|
index bce72f1bad69..ecac488055a0 100755
|
|
--- a/src/etc/rust-lldb
|
|
+++ b/src/etc/rust-lldb
|
|
@@ -8,7 +8,7 @@ host=$(rustc -vV | sed -n -e 's/^host: //p')
|
|
|
|
# Find out where to look for the pretty printer Python module
|
|
RUSTC_SYSROOT=$(rustc --print sysroot)
|
|
-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
|
|
+RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
|
|
|
|
lldb=lldb
|
|
if [ -f "$RUST_LLDB" ]; then
|