Merge branch 'rust' into 'master'

user/rust: Bump to 1.31.1

This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/

See merge request !131

1 files changed, 6 insertions, 6 deletions

diff --git a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
index 0d26e476a..f56ceb7e8 100644
--- a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+++ b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
@@ -1,17 +1,17 @@
-From 79975694944ee2a36abb9b0a9a54169a062aaa71 Mon Sep 17 00:00:00 2001
+From 2a82e95d73d7e86bd420c15f712b09eb104a82c1 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Wed, 10 Jan 2018 13:36:41 -0600
-Subject: [PATCH 01/24] Don't pass CFLAGS to the C++ compiler
+Subject: [PATCH 01/23] Don't pass CFLAGS to the C++ compiler
 
 ---
  src/bootstrap/builder.rs | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index b842bc43f5..1dd128fd95 100644
+index 02e9ca9250..7be38b1e8b 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -1045,7 +1045,7 @@ impl<'a> Builder<'a> {
+@@ -1041,7 +1041,7 @@ impl<'a> Builder<'a> {
              let cflags = self.cflags(target, GitRepo::Rustc).join(" ");
              cargo
                  .env(format!("CFLAGS_{}", target), cflags.clone())
@@ -20,7 +20,7 @@ index b842bc43f5..1dd128fd95 100644
  
              if let Some(ar) = self.ar(target) {
                  let ranlib = format!("{} s", ar.display());
-@@ -1060,9 +1060,7 @@ impl<'a> Builder<'a> {
+@@ -1056,9 +1056,7 @@ impl<'a> Builder<'a> {
                  let cxx = ccacheify(&cxx);
                  cargo
                      .env(format!("CXX_{}", target), &cxx)
@@ -32,5 +32,5 @@ index b842bc43f5..1dd128fd95 100644
          }
  
 -- 
-2.18.0
+2.19.2