1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 6861c8305fc6449fdc019405d501e5740d44b818 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/14] 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 9c58f5b179..bbb275c572 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1037,7 +1037,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());
@@ -1052,9 +1052,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.21.0
|
