summaryrefslogtreecommitdiff
path: root/user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-09-19 02:31:46 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-25 00:08:16 +0000
commitcd980d29292f8f5d6bb8bef5773ce91b95bfb90a (patch)
tree7eeb0fd1825894538eea675625a9f3009f3fca9d /user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch
parent63266fdc6f2014cc6dfd0f983e13de7c378bc708 (diff)
downloadpackages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.gz
packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.bz2
packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.xz
packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.zip
user/rust: new package
Diffstat (limited to 'user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch')
-rw-r--r--user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch
new file mode 100644
index 000000000..a3efabf93
--- /dev/null
+++ b/user/rust/0002-Don-t-pass-CFLAGS-to-the-C-compiler.patch
@@ -0,0 +1,36 @@
+From b77da61648c4787be551de6f654148c3686c7a3e Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 10 Jan 2018 13:36:41 -0600
+Subject: [PATCH 02/28] 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 dc0b0aaf0b..257d369750 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -966,7 +966,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());
+@@ -981,9 +981,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
+