summaryrefslogtreecommitdiff
path: root/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-07-05 23:26:12 -0500
committerSamuel Holland <samuel@sholland.org>2019-09-05 02:05:29 +0000
commit7ff61b754950fa82d16e1bcbb458c54a38598f2a (patch)
tree15c91da7a3615df6c9dc7dad00b50ba4ddb813d7 /user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
parent1c147dccb8b8b31fbc830e963f301e99ebc25d8d (diff)
downloadpackages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.gz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.bz2
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.xz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.zip
user/rust: Bump to 1.36.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch')
-rw-r--r--user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch8
1 files changed, 4 insertions, 4 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 f6a0ddb6b..7bd3daed7 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 600b7bb76d82d2ec180051318d811ad50fd68900 Mon Sep 17 00:00:00 2001
+From 3ee2eb230aa2414a7cf5e55cba365edbd20e25b4 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/13] Don't pass CFLAGS to the C++ compiler
+Subject: [PATCH 01/12] Don't pass CFLAGS to the C++ compiler
---
src/bootstrap/builder.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 522466314d..86f059a202 100644
+index 51663e93169..af4b471921c 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
-@@ -1098,8 +1098,7 @@ impl<'a> Builder<'a> {
+@@ -1116,8 +1116,7 @@ impl<'a> Builder<'a> {
if let Ok(cxx) = self.cxx(target) {
let cxx = ccacheify(&cxx);
cargo