Updated to 1.29.0

3 files changed, 39 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e64fe322d554..ab5f2ca5913e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-rust
 	pkgdesc = Systems programming language focused on safety, speed and concurrency (mingw-w64)
-	pkgver = 1.28.0
+	pkgver = 1.29.0
 	pkgrel = 1
 	url = https://www.rust-lang.org
 	arch = x86_64
@@ -19,32 +19,32 @@ pkgbase = mingw-w64-rust
 	depends = libgit2
 	depends = mingw-w64-gcc
 	optdepends = mingw-w64-wine: for cargo test support
-	noextract = rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz
-	noextract = rustc-1.27.2-x86_64-unknown-linux-gnu.tar.gz
-	noextract = cargo-0.28.0-x86_64-unknown-linux-gnu.tar.gz
+	noextract = rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+	noextract = rustc-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+	noextract = cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
 	options = !strip
 	options = staticlibs
 	options = !buildflags
 	backup = opt/rust/cargo/config
-	source = https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz
-	source = https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2018-07-20/rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz
-	source = https://static.rust-lang.org/dist/2018-07-20/rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz.asc
-	source = https://static.rust-lang.org/dist/2018-07-20/rustc-1.27.2-x86_64-unknown-linux-gnu.tar.gz
-	source = https://static.rust-lang.org/dist/2018-07-20/rustc-1.27.2-x86_64-unknown-linux-gnu.tar.gz.asc
-	source = https://static.rust-lang.org/dist/2018-07-20/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.gz
-	source = https://static.rust-lang.org/dist/2018-07-20/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.gz.asc
+	source = https://static.rust-lang.org/dist/rustc-1.29.0-src.tar.gz
+	source = https://static.rust-lang.org/dist/rustc-1.29.0-src.tar.gz.asc
+	source = https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+	source = https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz.asc
+	source = https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+	source = https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-x86_64-unknown-linux-gnu.tar.gz.asc
+	source = https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
+	source = https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = 8a899afd4b502b4ebff5cfc82cba77a8cb37113b5e6018f15c09545936081848
+	sha256sums = a4eb34ffd47f76afe2abd813f398512d5a19ef00989d37306217c9c9ec2f61e9
 	sha256sums = SKIP
-	sha256sums = 68984f2233853d3e9c7c56edd72a91b5822157f28fdb42023fb311af68f842dd
+	sha256sums = c5aed4c7ef362b5754526d26acaccdc9300942fd12e5cc67cc56fc89576a9dab
 	sha256sums = SKIP
-	sha256sums = ec3efc17ddbe6625840957049e15ebae960f447c8e8feb7da40c28dd6adf655f
+	sha256sums = 008bb3d714544bc991594b29a98a154441914c4771007130361bbadfb54143d0
 	sha256sums = SKIP
-	sha256sums = 35da884d43a8620534f6da1fbdd05f1e1f24823749f93d3d3be0eb46b3a6d884
+	sha256sums = a5e7749767c47669ed9b6e32c6fb8eda6b0fe1c63ac73a6d4666b5c1352bad24
 	sha256sums = SKIP
-	sha256sums = 766a6448a2ea589d43186db7911053913c2accf05ae8eefc1f04326816d04b8b
+	sha256sums = 331714f8cc5057a749e536af4d7559ff2b4862423f96aaaed337fa570fd39e89
 
 pkgname = mingw-w64-rust
 
diff --git a/PKGBUILD b/PKGBUILD
index 071f3b150517..fd08b99811b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 # Contributor: userwithuid <userwithuid@gmail.com>
 
 _pkgname=rust
-_date=2018-07-20
-_rustc=1.27.2
-_cargo=0.28.0
+_date=2018-08-02
+_rustc=1.28.0
+_cargo=0.29.0
 
 pkgname=mingw-w64-rust
-pkgver=1.28.0
+pkgver=1.29.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('x86_64')
@@ -29,7 +29,7 @@ makedepends=('gdb'
              'nodejs'
              'cmake')
 options=('!strip' 'staticlibs' '!buildflags')
-source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
+source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.gz"{,.asc}
         "https://static.rust-lang.org/dist/${_date}/rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.gz"{,.asc}
         "https://static.rust-lang.org/dist/${_date}/rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.gz"{,.asc}
         "https://static.rust-lang.org/dist/${_date}/cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.gz"{,.asc}
@@ -37,15 +37,15 @@ source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
 noextract=("rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.gz"
            "rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.gz"
            "cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.gz")
-sha256sums=('8a899afd4b502b4ebff5cfc82cba77a8cb37113b5e6018f15c09545936081848'
+sha256sums=('a4eb34ffd47f76afe2abd813f398512d5a19ef00989d37306217c9c9ec2f61e9'
             'SKIP'
-            '68984f2233853d3e9c7c56edd72a91b5822157f28fdb42023fb311af68f842dd'
+            'c5aed4c7ef362b5754526d26acaccdc9300942fd12e5cc67cc56fc89576a9dab'
             'SKIP'
-            'ec3efc17ddbe6625840957049e15ebae960f447c8e8feb7da40c28dd6adf655f'
+            '008bb3d714544bc991594b29a98a154441914c4771007130361bbadfb54143d0'
             'SKIP'
-            '35da884d43a8620534f6da1fbdd05f1e1f24823749f93d3d3be0eb46b3a6d884'
+            'a5e7749767c47669ed9b6e32c6fb8eda6b0fe1c63ac73a6d4666b5c1352bad24'
             'SKIP'
-            '766a6448a2ea589d43186db7911053913c2accf05ae8eefc1f04326816d04b8b')
+            '331714f8cc5057a749e536af4d7559ff2b4862423f96aaaed337fa570fd39e89')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
 
 backup=("opt/${_pkgname}/cargo/config")
@@ -56,12 +56,13 @@ prepare() {
 
   cp "${srcdir}"/mingw-config.toml config.toml
   sed -i "s|\@PREFIX\@|/opt/${_pkgname}|" config.toml
+  cd "${srcdir}/rustc-${pkgver}-src/src/bootstrap"
 
   cd "${srcdir}"
   mkdir -p "${srcdir}/rustc-${pkgver}-src/build/cache/${_date}"
-  cp rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.gz "${srcdir}/rustc-${pkgver}-src/build/cache/${_date}"
-  cp rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.gz "${srcdir}/rustc-${pkgver}-src/build/cache/${_date}"
-  cp cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.gz "${srcdir}/rustc-${pkgver}-src/build/cache/${_date}"
+  cp rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.gz "rustc-${pkgver}-src/build/cache/${_date}"
+  cp rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.gz "rustc-${pkgver}-src/build/cache/${_date}"
+  cp cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.gz "rustc-${pkgver}-src/build/cache/${_date}"
 }
 
 build() {
@@ -107,7 +108,7 @@ package() {
 
   # strip
   strip --strip-all "${pkgdir}/opt/${_pkgname}/bin/"{cargo,rustc,rustdoc}
-  strip --strip-all "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/bin/"lld
+  strip --strip-all "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/bin/"rust-lld
   strip --strip-unneeded "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/lib/"*.so
   strip --strip-unneeded "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/"*.so
   i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/opt/${_pkgname}/lib/rustlib/i686-pc-windows-gnu/lib/"*.dll
diff --git a/mingw-config.toml b/mingw-config.toml
index 1c52bced8dd8..8c0a58bc8e8c 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -350,12 +350,19 @@ wasm-syscall = false
 # rustc to execute.
 lld = true
 
+# Indicates whether some LLVM tools, like llvm-objdump, will be made available in the
+# sysroot.
+llvm-tools = false
+
 # Whether to deny warnings in crates
 deny-warnings = false
 
 # Print backtrace on internal compiler errors during bootstrap
 backtrace-on-ice = false
 
+# Whether to verify generated LLVM IR
+verify-llvm-ir = false
+
 # =============================================================================
 # Options for specific targets
 #