Updated to 1.40.0

3 files changed, 39 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 784321197848..a306a39fe953 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.39.0
+	pkgver = 1.40.0
 	pkgrel = 1
 	url = https://www.rust-lang.org
 	arch = x86_64
@@ -21,32 +21,32 @@ pkgbase = mingw-w64-rust
 	depends = libgit2
 	depends = mingw-w64-gcc
 	optdepends = mingw-w64-wine: for cargo test support
-	noextract = rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = rustc-1.38.0-x86_64-unknown-linux-gnu.tar.xz
-	noextract = cargo-0.39.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rust-std-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = rustc-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+	noextract = cargo-0.40.0-x86_64-unknown-linux-gnu.tar.xz
 	options = !strip
 	options = staticlibs
 	options = !buildflags
 	backup = opt/rust/cargo/config
-	source = https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.xz
-	source = https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.xz.asc
-	source = https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.xz
-	source = https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz
+	source = https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-gnu.tar.xz.asc
+	source = https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-gnu.tar.xz
+	source = https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-gnu.tar.xz.asc
 	source = mingw-config.toml
 	validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
-	sha256sums = 4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29
+	sha256sums = 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace
 	sha256sums = SKIP
-	sha256sums = 51b334337804baeff7524e5496d396f254894d7529860d236975e9ed8fcca371
+	sha256sums = b629952ec9e3e750137d7b8a922de145c97c1dc372dd616e86e4e501da13910b
 	sha256sums = SKIP
-	sha256sums = 0fedde3406cf3367ceb00f493698e6bfc3264bd7f7253c85de7a042b45f873fa
+	sha256sums = 5b2a435a4c034615d70cfc383abe9924cbd1ffd4669caa55ce6539f22ed979ed
 	sha256sums = SKIP
-	sha256sums = 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a
+	sha256sums = 7b9ba52c252964724f49aab49e42bec62fca929297ef058412c7e727b0794620
 	sha256sums = SKIP
-	sha256sums = 4623965c75023ee367d28c5530f038c318f767c6535a0c80856783ea77e23433
+	sha256sums = e3c3b4b9927a0e5fc05ca7045ab4bfef5eeef701b47f1b8822f9041a31bdd54a
 
 pkgname = mingw-w64-rust
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b74a8fa7de4..c18a8b1b8cbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: userwithuid < userwithuid at gmail dot com >
 
 _pkgname=rust
-_date=2019-09-26
-_rustc=1.38.0
-_cargo=0.39.0
+_date=2019-11-07
+_rustc=1.39.0
+_cargo=0.40.0
 
 pkgname=mingw-w64-rust
 _prefix=opt/rust
-pkgver=1.39.0
+pkgver=1.40.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('x86_64')
@@ -40,15 +40,15 @@ source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
 noextract=("rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
            "rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
            "cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.xz")
-sha256sums=('4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29'
+sha256sums=('6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace'
             'SKIP'
-            '51b334337804baeff7524e5496d396f254894d7529860d236975e9ed8fcca371'
+            'b629952ec9e3e750137d7b8a922de145c97c1dc372dd616e86e4e501da13910b'
             'SKIP'
-            '0fedde3406cf3367ceb00f493698e6bfc3264bd7f7253c85de7a042b45f873fa'
+            '5b2a435a4c034615d70cfc383abe9924cbd1ffd4669caa55ce6539f22ed979ed'
             'SKIP'
-            '80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a'
+            '7b9ba52c252964724f49aab49e42bec62fca929297ef058412c7e727b0794620'
             'SKIP'
-            '4623965c75023ee367d28c5530f038c318f767c6535a0c80856783ea77e23433')
+            'e3c3b4b9927a0e5fc05ca7045ab4bfef5eeef701b47f1b8822f9041a31bdd54a')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
 
 backup=("opt/rust/cargo/config")
@@ -76,20 +76,19 @@ prepare() {
 build() {
   cd "rustc-${pkgver}-src"
 
-  export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-  export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-  # BUG: x.py install will build rust a second time
-  #python ./x.py build
+  export CFLAGS="-O2 -pipe -fno-plt -Wall -D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+  export CXXFLAGS="-O2 -pipe -fno-plt -Wall -D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+  python ./x.py build
 }
 
 package() {
   cd "rustc-${pkgver}-src"
 
   # rust will build install tools there
-  export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-  export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+  export CFLAGS="-O2 -pipe -fno-plt -Wall -D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+  export CXXFLAGS="-O2 -pipe -fno-plt -Wall -D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
   # TODO: find a way to disable packaging
-  DESTDIR="${pkgdir}" python ./x.py install
+  DESTDIR="${pkgdir}" python ./x.py install --keep-stage 0 --keep-stage 1
 
   # license
   install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}/"{rust,cargo}
diff --git a/mingw-config.toml b/mingw-config.toml
index 5c5572f23993..af93f542a329 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -258,10 +258,9 @@ localstatedir = "/var/lib"
 [rust]
 
 # Whether or not to optimize the compiler and standard library.
-#
-# Note: the slowness of the non optimized compiler compiling itself usually
-#       outweighs the time gains in not doing optimizations, therefore a
-#       full bootstrap takes much more time with `optimize` set to false.
+# WARNING: Building with optimize = false is NOT SUPPORTED. Due to bootstrapping,
+# building without optimizations takes much longer than optimizing. Further, some platforms
+# fail to build without this optimization (c.f. #65352).
 optimize = true
 
 # Indicates that the build should be configured for debugging Rust. A
@@ -341,6 +340,9 @@ default-linker = "cc"
 # nightly features
 channel = "stable"
 
+# The root location of the MUSL installation directory.
+#musl-root = "..."
+
 # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
 # platforms to ensure that the compiler is usable by default from the build
 # directory (as it links to a number of dynamic libraries). This may not be
@@ -374,9 +376,7 @@ dist-src = false
 
 # This is an array of the codegen backends that will be compiled for the rustc
 # that's being compiled. The default is to only build the LLVM codegen backend,
-# but you can also optionally enable the "emscripten" backend for asm.js or
-# make this an empty array (but that probably won't get too far in the
-# bootstrap)
+# and currently the only standard option supported is `"llvm"`
 codegen-backends = ["llvm"]
 
 # This is the name of the directory in which codegen backends will get installed