Merge branch 'rust' into 'master'

user/rust: Bump to 1.30.1



See merge request !105

1 files changed, 36 insertions, 0 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
new file mode 100644
index 000000000..0d26e476a
--- /dev/null
+++ b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
@@ -0,0 +1,36 @@
+From 79975694944ee2a36abb9b0a9a54169a062aaa71 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
+
+---
+ 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
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1045,7 +1045,7 @@ impl<'a> Builder<'a> {
+             let cflags = self.cflags(target, GitRepo::Rustc).join(" ");
+             cargo
+                 .env(format!("CFLAGS_{}", target), cflags.clone())
+-                .env("CFLAGS", cflags.clone());
++                .env("CFLAGS", cflags);
+ 
+             if let Some(ar) = self.ar(target) {
+                 let ranlib = format!("{} s", ar.display());
+@@ -1060,9 +1060,7 @@ impl<'a> Builder<'a> {
+                 let cxx = ccacheify(&cxx);
+                 cargo
+                     .env(format!("CXX_{}", target), &cxx)
+-                    .env("CXX", &cxx)
+-                    .env(format!("CXXFLAGS_{}", target), cflags.clone())
+-                    .env("CXXFLAGS", cflags);
++                    .env("CXX", &cxx);
+             }
+         }
+ 
+-- 
+2.18.0
+