update to LLVM 12

This commit is contained in:
Ximin Luo 2021-05-19 17:48:21 +01:00
parent 7716a4c1e7
commit 07aed34724
7 changed files with 22 additions and 16 deletions

2
debian/bin/rust-lld vendored
View File

@ -6,4 +6,4 @@
# However the tests fail for other reasons, namely we can't build rustdoc
# (which runs the tests) in wasm32 yet. So this is just WIP at the moment,
# it is not expect to work nor to be installed on user machines.
exec /usr/bin/lld-11 "${@/#-Wl,/}"
exec /usr/bin/lld-12 "${@/#-Wl,/}"

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
rustc (1.52.1+dfsg1-1~exp3) UNRELEASED; urgency=medium
* Update to LLVM 12.
-- Ximin Luo <infinity0@debian.org> Wed, 19 May 2021 17:47:57 +0100
rustc (1.52.1+dfsg1-1~exp2) experimental; urgency=medium
* Fix rust-clippy dependency on libstd-rust-*

16
debian/control vendored
View File

@ -15,11 +15,11 @@ Build-Depends:
cargo:native (>= 0.40.0) <!pkg.rustc.dlstage0>,
rustc:native (>= 1.51.0+dfsg) <!pkg.rustc.dlstage0>,
rustc:native (<= 1.52.1++) <!pkg.rustc.dlstage0>,
llvm-11-dev:native,
llvm-11-tools:native,
llvm-12-dev:native,
llvm-12-tools:native,
gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
libllvm11,
libllvm12,
cmake (>= 3.0) | cmake3,
# needed by some vendor crates
pkg-config,
@ -40,7 +40,7 @@ Build-Depends:
Build-Depends-Indep:
wasi-libc (>= 0.0~git20201130.5879558~~) <!nowasm>,
wasi-libc (<= 0.0~git20201130.5879558++) <!nowasm>,
clang-11:native,
clang-12:native,
Build-Conflicts: gdb-minimal <!nocheck>
Standards-Version: 4.2.1
Homepage: http://www.rust-lang.org/
@ -56,7 +56,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version
Recommends: cargo (>= 0.53.0~~), cargo (<< 0.54.0~~), rust-gdb | rust-lldb
# lld is needed for wasm compilation
# llvm is needed for llvm-dwp for split-debuginfo
Suggests: rust-doc, rust-src, lld-11, llvm-11
Suggests: rust-doc, rust-src, lld-12, llvm-12
Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Description: Rust systems programming language
@ -149,8 +149,8 @@ Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
# Embeds wasi-libc so doesn't need to depend on it
# None of its licenses require source redistrib, so no need for Built-Using
Recommends: lld-11
Suggests: clang-11, nodejs (>= 12.16)
Recommends: lld-12
Suggests: clang-12, nodejs (>= 12.16)
# nodejs contains wasi-node for running the program
Build-Profiles: <!nowasm>
Description: Rust standard libraries - development files
@ -194,7 +194,7 @@ Description: Rust debugger (gdb)
Package: rust-lldb
Architecture: all
# When updating, also update rust-lldb.links
Depends: lldb-11, ${misc:Depends}, python3-lldb-11
Depends: lldb-12, ${misc:Depends}, python3-lldb-12
Replaces: rustc (<< 1.1.0+dfsg1-1)
Description: Rust debugger (lldb)
Rust is a curly-brace, block-structured expression language. It

View File

@ -15,7 +15,7 @@ Forwarded: not-needed
RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
-lldb=lldb
+lldb=lldb-11
+lldb=lldb-12
if [ -f "$RUST_LLDB" ]; then
lldb="$RUST_LLDB"
else

4
debian/rules vendored
View File

@ -27,8 +27,8 @@ export DEB_HOST_RUST_TYPE
DEB_DESTDIR := $(CURDIR)/debian/tmp
# Use system LLVM (comment out to use vendored LLVM)
LLVM_VERSION = 11
OLD_LLVM_VERSION = 10
LLVM_VERSION = 12
OLD_LLVM_VERSION = 11
# Make it easier to test against a custom LLVM
ifneq (,$(LLVM_DESTDIR))
LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib

View File

@ -1 +1 @@
usr/share/man/man1/lldb-11.1.gz usr/share/man/man1/rust-lldb.1.gz
usr/share/man/man1/lldb-12.1.gz usr/share/man/man1/rust-lldb.1.gz

6
debian/rustc.links vendored
View File

@ -1,3 +1,3 @@
usr/bin/lld-11 usr/bin/rust-lld
usr/bin/clang-11 usr/bin/rust-clang
usr/bin/llvm-dwp-11 usr/bin/rust-llvm-dwp
usr/bin/lld-12 usr/bin/rust-lld
usr/bin/clang-12 usr/bin/rust-clang
usr/bin/llvm-dwp-12 usr/bin/rust-llvm-dwp