rust: 1.72.1 -> 1.73.0
This commit is contained in:
parent
f71452971d
commit
9b54fe43a3
GPG Key ID:
42F8B4E30B673606
@ -16,7 +16,6 @@ drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/rustdoc
|
||||
-rwxr-xr-x root/root usr/bin/rustfmt
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/cargo-credential-1password
|
||||
-rwxr-xr-x root/root usr/lib/rust-analyzer-proc-macro-srv
|
||||
drwxr-xr-x root/root usr/lib/rustlib/
|
||||
drwxr-xr-x root/root usr/lib/rustlib/etc/
|
||||
@ -412,6 +411,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/intersperse.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/map.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/map_while.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/map_windows.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/peekable.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/rev.rs
|
||||
@ -597,6 +597,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/cmp.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/const_ptr.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/convert.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/error.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/builders.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/float.rs
|
||||
@ -624,6 +625,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/inspect.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/intersperse.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/map.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/map_windows.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/peekable.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/scan.rs
|
||||
@ -1164,14 +1166,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/panic/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/path.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/path/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/path/tests.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/personality/
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/personality/dwarf/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality/dwarf/eh.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality/dwarf/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality/dwarf/tests.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality/emcc.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/personality/gcc.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/prelude/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/prelude/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/prelude/v1.rs
|
||||
@ -1261,6 +1255,14 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/tests.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/mod.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/dwarf/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/dwarf/eh.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/dwarf/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/dwarf/tests.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/emcc.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/gcc.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/personality/mod.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/entry.S
|
||||
@ -1530,7 +1532,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/tests/common/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/common/mod.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/create_dir_all_bare.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/env.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/process_spawning.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/run-time-detect.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/switch-stdout.rs
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/tests/thread.rs
|
||||
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/.cirrus.yml
|
||||
@ -1926,7 +1930,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRustSgx.c
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRustSgx.h
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind_AIXExtras.cpp
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind_AppleExtras.cpp
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/assembly.h
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/cet_unwind.h
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/config.h
|
||||
@ -1942,6 +1945,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/co
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/cmake-bridge.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/ibm-libunwind-shared.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/llvm-libunwind-merged.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/llvm-libunwind-mingw.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/llvm-libunwind-shared.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/configs/llvm-libunwind-static.cfg.in
|
||||
-rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/floatregister.pass.cpp
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/arpacNmyuf66KcNbQ4dDOiVQo1Z2IzcWJZ9jOJzslx16J7XWiB5tskfilpONH/5J0Vefv0gPcbWTYgLplwv5gc=
|
||||
SHA256 (Pkgfile) = 6894618efee6ee9ed95b28e79a21972dbb3bcb269c9ea580d76d3c52d4ae900b
|
||||
SHA256 (.footprint) = 5bef79ca1ee1814a1c4c746003cbbf376a751e611b438f9bddd090f0e080e3ad
|
||||
SHA256 (rustc-1.72.1-src.tar.xz) = aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3
|
||||
SHA256 (rust-std-1.71.0-x86_64-unknown-linux-gnu.tar.xz) = 98ae6530c3a41167e9d93d11ea078be98a02f6d809a06d0d51af3ce0f73150d7
|
||||
SHA256 (rustc-1.71.0-x86_64-unknown-linux-gnu.tar.xz) = c293d906769671d1cd18e945671bbd14e0b8a41df5075c47f33e6086fc8a1558
|
||||
SHA256 (cargo-1.71.0-x86_64-unknown-linux-gnu.tar.xz) = fe6fb520f59966300ee661d18b37c36cb3e614877c4c01dfedf987b8a9c577e9
|
||||
SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 34391ebea7d9c10246c4f3cbe05b3d5587a72105887dab5ecb00d10ea6a10d6a
|
||||
SHA256 (0001-cargo-Change-libexec-dir.patch) = d13721d13fab60d3c80c95f740186b07cfad82af9ee9f52c17c29bf8bce0ba37
|
||||
RWSE3ohX2g5d/Y8oZCfzUmBUe8J/CcN6bek34ADqkTu+z63A/97cdW07ZmIWfOa7yvifVDPewM9wJ1sLKKfmiEchQzUQ8xG3kAw=
|
||||
SHA256 (Pkgfile) = 40ea354ed9d549656d8f30729849060e140e9eb4975feaf1c34983c19524db9c
|
||||
SHA256 (.footprint) = 73c053d5a76cd89ca37c8c1d26d64af0ed34adc8acf10ed983462a62cb30b14c
|
||||
SHA256 (rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
|
||||
SHA256 (rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.xz) = 36f27513a6e4381f15b0cd14097c885af537f990cb6193cec3337c429367bf23
|
||||
SHA256 (rustc-1.72.0-x86_64-unknown-linux-gnu.tar.xz) = 5b5d7854a0d73368f15146c1aa47e4dbccf12762c93282f410a09a605929ce09
|
||||
SHA256 (cargo-1.72.0-x86_64-unknown-linux-gnu.tar.xz) = 4a401dfe7b3056dc0d42acbcd380b2b90f936577706ca74ef5327af0f5abd0a0
|
||||
SHA256 (0001-bootstrap-Change-libexec-dir.patch) = bef7b7df03d14d7ecbc95521463c1b870680a3e54238fb63679a184b56d4be83
|
||||
SHA256 (0002-compiler-Change-LLVM-targets.patch) = 4a4ff5c294acc0b1ca800856218770f6330a878acee72193aa456d82846a8a28
|
||||
SHA256 (0004-compiler-Use-wasm-ld-for-wasm-targets.patch) = 2d3f60dc86c81d331aa7df331c29289264f57e7b3fc74a32161eff176e24b68f
|
||||
|
||||
@ -1,7 +1,18 @@
|
||||
diff -Naur rustc-1.69.0-src.orig/src/bootstrap/dist.rs rustc-1.69.0-src/src/bootstrap/dist.rs
|
||||
--- rustc-1.69.0-src.orig/src/bootstrap/dist.rs 2023-04-20 18:44:12.729757614 +0200
|
||||
+++ rustc-1.69.0-src/src/bootstrap/dist.rs 2023-04-20 18:44:35.529964417 +0200
|
||||
@@ -414,7 +414,7 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Thu, 6 May 2021 20:14:58 +0200
|
||||
Subject: [PATCH] bootstrap: Change libexec dir
|
||||
|
||||
---
|
||||
src/bootstrap/dist.rs | 2 +-
|
||||
src/bootstrap/tool.rs | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
||||
index 32da4ac29a46..78a5faeae04b 100644
|
||||
--- a/src/bootstrap/dist.rs
|
||||
+++ b/src/bootstrap/dist.rs
|
||||
@@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
|
||||
},
|
||||
builder.kind,
|
||||
) {
|
||||
@ -10,19 +21,11 @@ diff -Naur rustc-1.69.0-src.orig/src/bootstrap/dist.rs rustc-1.69.0-src/src/boot
|
||||
}
|
||||
|
||||
let libdir_relative = builder.libdir_relative(compiler);
|
||||
@@ -1064,7 +1064,7 @@
|
||||
for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
|
||||
let dirent = dirent.expect("read dir entry");
|
||||
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
|
||||
- tarball.add_file(&dirent.path(), "libexec", 0o755);
|
||||
+ tarball.add_file(&dirent.path(), "lib", 0o755);
|
||||
}
|
||||
}
|
||||
|
||||
diff -Naur rustc-1.69.0-src.orig/src/bootstrap/tool.rs rustc-1.69.0-src/src/bootstrap/tool.rs
|
||||
--- rustc-1.69.0-src.orig/src/bootstrap/tool.rs 2023-04-20 18:44:12.729757614 +0200
|
||||
+++ rustc-1.69.0-src/src/bootstrap/tool.rs 2023-04-20 18:44:42.146691099 +0200
|
||||
@@ -850,7 +850,7 @@
|
||||
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
|
||||
index e6d27757ac66..70e499bdabbe 100644
|
||||
--- a/src/bootstrap/tool.rs
|
||||
+++ b/src/bootstrap/tool.rs
|
||||
@@ -689,7 +689,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
|
||||
|
||||
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
|
||||
// so that r-a can use it.
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Thu, 6 May 2021 20:13:31 +0200
|
||||
Subject: [PATCH] cargo: Change libexec dir
|
||||
|
||||
---
|
||||
src/cargo/util/auth/mod.rs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cargo/util/auth/mod.rs b/src/cargo/util/auth/mod.rs
|
||||
index 58309964f493..f621e1d643c4 100644
|
||||
--- a/src/cargo/util/auth/mod.rs
|
||||
+++ b/src/cargo/util/auth/mod.rs
|
||||
@@ -711,7 +711,7 @@ fn sysroot_credential(
|
||||
.parent()
|
||||
.and_then(|p| p.parent())
|
||||
.ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
|
||||
- let exe = root.join("libexec").join(format!(
|
||||
+ let exe = root.join("lib").join(format!(
|
||||
"cargo-credential-{}{}",
|
||||
cred_name,
|
||||
std::env::consts::EXE_SUFFIX
|
||||
|
||||
24
rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
Normal file
24
rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Sat, 6 Nov 2021 22:42:06 +0100
|
||||
Subject: [PATCH] compiler: Use wasm-ld for wasm targets
|
||||
|
||||
We don't ship rust-lld.
|
||||
---
|
||||
compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
index 341763aadbaf..dbb075affc18 100644
|
||||
--- a/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||
@@ -89,8 +89,7 @@ macro_rules! args {
|
||||
// arguments just yet
|
||||
limit_rdylib_exports: false,
|
||||
|
||||
- // we use the LLD shipped with the Rust toolchain by default
|
||||
- linker: Some("rust-lld".into()),
|
||||
+ linker: Some("wasm-ld".into()),
|
||||
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
||||
|
||||
pre_link_args,
|
||||
50
rust/Pkgfile
50
rust/Pkgfile
@ -2,22 +2,22 @@
|
||||
# URL: https://www.rust-lang.org/
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
# Depends on: compiler-rt
|
||||
# Optional: ccache libgit2 lld polly sccache
|
||||
# Optional: ccache clang libgit2 lld polly sccache
|
||||
|
||||
name=rust
|
||||
version=1.72.1
|
||||
_date=2023-07-13
|
||||
_rustc=1.71.0
|
||||
version=1.73.0
|
||||
_date=2023-08-24
|
||||
_rustc=1.72.0
|
||||
_cargo=$_rustc
|
||||
release=3
|
||||
release=1
|
||||
|
||||
source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
|
||||
https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-gnu.tar.xz
|
||||
https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz
|
||||
https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz
|
||||
0001-bootstrap-Change-libexec-dir.patch
|
||||
0001-cargo-Change-libexec-dir.patch
|
||||
0002-compiler-Change-LLVM-targets.patch)
|
||||
0002-compiler-Change-LLVM-targets.patch
|
||||
0004-compiler-Use-wasm-ld-for-wasm-targets.patch)
|
||||
|
||||
unpack_source() {
|
||||
for file in ${source[@]}; do
|
||||
@ -62,18 +62,12 @@ build() {
|
||||
|
||||
cd "${name}c-$version-src"
|
||||
|
||||
# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
|
||||
patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch
|
||||
patch -d src/tools/cargo -Np1 -i $SRC/0001-cargo-Change-libexec-dir.patch
|
||||
|
||||
# Use our *-pc-linux-gnu targets, making LTO with clang simpler
|
||||
patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch
|
||||
|
||||
# temp fixes for LLVM 17
|
||||
# https://www.linuxfromscratch.org/blfs/view/svn/general/rust.html
|
||||
sed 's/FS,/"", &/' -i ./compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
|
||||
sed '/LLVMContext.h/i#include "llvm/ADT/SmallString.h"' \
|
||||
-i compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp
|
||||
patch -Np1 -i $SRC/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
|
||||
|
||||
cat <<- EOF > $SRC/config.toml
|
||||
changelog-seen = 2
|
||||
@ -131,24 +125,23 @@ cat <<- EOF > $SRC/config.toml
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
llvm-config = "/usr/bin/llvm-config"
|
||||
llvm-filecheck = "/usr/bin/FileCheck"
|
||||
cc = "/usr/bin/gcc"
|
||||
cxx = "/usr/bin/g++"
|
||||
ar = "/usr/bin/gcc-ar"
|
||||
ranlib = "/usr/bin/gcc-ranlib"
|
||||
cc = @TARGETCC@
|
||||
cxx = @TARGETCXX@
|
||||
ar = @TARGETAR@
|
||||
ranlib = @TARGETRANLIB@
|
||||
|
||||
[target.i686-unknown-linux-gnu]
|
||||
llvm-config = "/usr/bin/llvm-config"
|
||||
llvm-filecheck = "/usr/bin/FileCheck"
|
||||
cc = "/usr/bin/gcc"
|
||||
cxx = "/usr/bin/g++"
|
||||
ar = "/usr/bin/gcc-ar"
|
||||
ranlib = "/usr/bin/gcc-ranlib"
|
||||
cc = @TARGETCC@
|
||||
cxx = @TARGETCXX@
|
||||
ar = @TARGETAR@
|
||||
ranlib = @TARGETRANLIB@
|
||||
EOF
|
||||
|
||||
if [ -e '/usr/bin/rustc' ]; then
|
||||
if [[ -z "$(/usr/bin/ldd /usr/bin/rustc | egrep '.*libLLVM.*.so => not found')" && \
|
||||
-z "$(/usr/bin/ldd /usr/bin/cargo | egrep 'libgit2.so.* => not found')" ]]; then
|
||||
|
||||
if ! /usr/bin/ldd /usr/bin/rustc | grep -q -E '.*libLLVM.*.so => not found' && \
|
||||
! /usr/bin/ldd /usr/bin/cargo | grep -q -E 'libgit2.so.* => not found'; then
|
||||
sed -e 's|@CARGO@|cargo = "/usr/bin/cargo"|' \
|
||||
-e 's|@RUST@|rustc = "/usr/bin/rustc"|' \
|
||||
-e 's|@RUSTFMT@|rustfmt = "/usr/bin/rustfmt"|' \
|
||||
@ -168,6 +161,12 @@ EOF
|
||||
sed -e 's|@CCACHE@||' -i $SRC/config.toml
|
||||
fi
|
||||
|
||||
# needed for other target compilers
|
||||
if prt-get isinst clang lld; then
|
||||
sed -e 's|@TARGETCC@|"clang"|g' -e 's|@TARGETCXX@|"clang++"|g' -e 's|@TARGETAR@|"llvm-ar"|g' -e 's|@TARGETRANLIB@|"llvm-ranlib"|g' -i $SRC/config.toml
|
||||
else
|
||||
sed -e 's|@TARGETCC@|"gcc"|g' -e 's|@TARGETCXX@|"g++"|g' -e 's|@TARGETAR@|"gcc-ar"|g' -e 's|@TARGETRANLIB@|"gcc-ranlib"|g' -i $SRC/config.toml
|
||||
fi
|
||||
prt-get isinst lld && sed -e 's|@LLD@|use-lld = true\nlld = true|' -i $SRC/config.toml || sed -e 's|@LLD@||' -i $SRC/config.toml
|
||||
prt-get isinst polly && sed -e 's|@POLLY@|polly = true|' -i $SRC/config.toml || sed -e 's|@POLLY@||' -i $SRC/config.toml
|
||||
|
||||
@ -201,6 +200,7 @@ EOF
|
||||
# cleanup
|
||||
rm -r $PKG/usr/share/doc
|
||||
rm $PKG/usr/lib/rustlib/{components,manifest-rustc,rust-installer-version,uninstall.sh}
|
||||
rm -rf $PKG/usr/lib/rustlib/x86_64-unknown-linux-gnu/bin
|
||||
|
||||
# Remove analysis data for libs that weren't installed
|
||||
local file lib
|
||||
|
||||
Loading…
Reference in New Issue
Block a user