1 files changed, 36 insertions, 0 deletions
diff --git a/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
new file mode 100644
index 00000000..5a69455b
--- /dev/null
+++ b/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
@@ -0,0 +1,36 @@
+From d1cc6048465f4cc7a06495b424693aa0c27f3137 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 10 Jan 2018 13:36:41 -0600
+Subject: [PATCH 8/8] 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 fcb78c479f..55848d6971 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -689,7 +689,7 @@ impl<'a> Builder<'a> {
+ 
+             let cflags = self.cflags(target).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());
+@@ -701,9 +701,7 @@ impl<'a> Builder<'a> {
+ 
+             if let Ok(cxx) = self.cxx(target) {
+                 cargo.env(format!("CXX_{}", target), cxx)
+-                     .env("CXX", cxx)
+-                     .env(format!("CXXFLAGS_{}", target), cflags.clone())
+-                     .env("CXXFLAGS", cflags);
++                     .env("CXX", cxx);
+             }
+         }
+ 
+-- 
+2.16.1
+