Skip to content

Commit

Permalink
rust: update to 1.65.0
Browse files Browse the repository at this point in the history
  • Loading branch information
filnet committed Nov 4, 2022
1 parent 3407b75 commit b5ac0de
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
20 changes: 10 additions & 10 deletions mingw-w64-rust/0007-clang-subsystem.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -urN rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.orig rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs
--- rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.orig 2022-09-19 16:07:21.000000000 +0200
+++ rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs 2022-09-22 21:23:00.763734800 +0200
@@ -23,30 +23,10 @@
diff -urN rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.orig rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs
--- rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.orig 2022-11-02 15:36:24.000000000 +0100
+++ rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs 2022-11-04 14:02:11.995756500 +0100
@@ -24,30 +24,10 @@
],
);

Expand Down Expand Up @@ -33,7 +33,7 @@ diff -urN rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.or
let mut late_link_args_dynamic =
TargetOptions::link_args(LinkerFlavor::Ld, dynamic_unwind_libs);
super::add_link_args(&mut late_link_args_dynamic, LinkerFlavor::Gcc, dynamic_unwind_libs);
@@ -55,7 +35,7 @@
@@ -56,7 +36,7 @@
// binaries to be redistributed without the libgcc_s-dw2-1.dll
// dependency, but unfortunately break unwinding across DLL
// boundaries when unwinding across FFI boundaries.
Expand All @@ -42,7 +42,7 @@ diff -urN rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.or
let mut late_link_args_static = TargetOptions::link_args(LinkerFlavor::Ld, static_unwind_libs);
super::add_link_args(&mut late_link_args_static, LinkerFlavor::Gcc, static_unwind_libs);

@@ -64,7 +44,8 @@
@@ -65,7 +45,8 @@
env: "gnu".into(),
vendor: "pc".into(),
// FIXME(#13846) this should be enabled for windows
Expand All @@ -52,10 +52,10 @@ diff -urN rustc-1.64.0-src/compiler/rustc_target/src/spec/windows_gnu_base.rs.or
linker: Some("gcc".into()),
dynamic_linking: true,
dll_prefix: "".into(),
@@ -79,7 +60,6 @@
pre_link_objects_fallback: crt_objects::pre_mingw_fallback(),
post_link_objects_fallback: crt_objects::post_mingw_fallback(),
crt_objects_fallback: Some(CrtObjectsFallback::Mingw),
@@ -80,7 +61,6 @@
pre_link_objects_self_contained: crt_objects::pre_mingw_self_contained(),
post_link_objects_self_contained: crt_objects::post_mingw_self_contained(),
link_self_contained: LinkSelfContainedDefault::Mingw,
- late_link_args,
late_link_args_dynamic,
late_link_args_static,
Expand Down
12 changes: 6 additions & 6 deletions mingw-w64-rust/0008-disable-self-contained.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- rustc-1.53.0-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2021-07-04 01:49:38.816000000 +0200
+++ rustc-1.53.0-src/compiler/rustc_codegen_ssa/src/back/link.rs 2021-07-04 12:45:55.559928800 +0200
@@ -1420,7 +1420,10 @@

/// Whether we link to our own CRT objects instead of relying on gcc to pull them.
--- rustc-1.65.0-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2022-11-02 15:36:24.000000000 +0100
+++ rustc-1.65.0-src/compiler/rustc_codegen_ssa/src/back/link.rs 2022-11-04 16:02:23.846112700 +0100
@@ -1573,7 +1573,10 @@
/// Various toolchain components used during linking are used from rustc distribution
/// instead of being found somewhere on the host system.
/// We only provide such support for a very limited number of targets.
+#[allow(warnings)]
fn crt_objects_fallback(sess: &Session, crate_type: CrateType) -> bool {
fn self_contained(sess: &Session, crate_type: CrateType) -> bool {
+ return false;
+
if let Some(self_contained) = sess.opts.cg.link_self_contained {
Expand Down
10 changes: 5 additions & 5 deletions mingw-w64-rust/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ _bootstrapping=yes
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-rust-docs")
pkgver=1.64.0
pkgrel=2
pkgver=1.65.0
pkgrel=1
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
Expand Down Expand Up @@ -38,13 +38,13 @@ source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz"{,
"0007-clang-subsystem.patch"
"0008-disable-self-contained.patch"
"0009-build-gnullvm-targets-natively.patch")
sha256sums=('b3cd9f481e1a2901bf6f3808d30c69cc4ea80d93c4cc4e2ed52258b180381205'
sha256sums=('5828bb67f677eabf8c384020582b0ce7af884e1c84389484f7f8d00dd82c0038'
'SKIP'
'7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
'36c531c73a2c12b3e66aa22526a404c3f770f1ab7e0e76c55af6fcc1a17e46fe'
'c4e5ffeef84296d39c3e3e8f807fc8b33ce786b1e4edb21eef26b053586aca27'
'c38450682a48bb1d5a0ddaa37ae5b324d39a9e0626daa2fc695caec1a53d6c35'
'29f84cb8e05ce304e102e28912a3b4464add406a8ec37a6c6d717b9b7d81b67b'
'aa847d81e733543dd8a242f957b7acf39b013952eeee6f0bf7c0f543be1328c4'
'a214cd8394ab7416fd170c7fa05daf701a5357d38e4e54149370e6efff208e50'
'c70cb2bceafdd5b0e7d9d58c52a4f5dcff3d639ac57b134a29961d377a97e457')
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <[email protected]>
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <[email protected]>
Expand Down

0 comments on commit b5ac0de

Please sign in to comment.