diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
| commit | 99162e025d3b7323de9deb3992feb4be7fdb2587 (patch) | |
| tree | 748dbd1630f96ba68d77eaee1f2cd708f00c5b4d /user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch | |
| parent | 032d4ce8dfbf86b3d18d9d91aec917b5824f1aad (diff) | |
| parent | 3febb3d8330926d97e865c3aeaddff95acef8b83 (diff) | |
| download | packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.gz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.bz2 packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.xz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.38.0
See merge request adelie/packages!365
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.patch | 8 |
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 492dbf7ec..83be00997 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 c5fd39c8da01cdb0fea0e323937abcf4895b7511 Mon Sep 17 00:00:00 2001 +From ffe35880050c7e38bb50cb9ecb7b325bb9eff6d9 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/16] Don't pass CFLAGS to the C++ compiler +Subject: [PATCH 01/18] 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 2e9df48d000..f5ced5b16ed 100644 +index e54c9360bae..7bdd73aa381 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -1138,8 +1138,7 @@ impl<'a> Builder<'a> { +@@ -1126,8 +1126,7 @@ impl<'a> Builder<'a> { if let Ok(cxx) = self.cxx(target) { let cxx = ccacheify(&cxx); cargo |