diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
| commit | 7f660eb77c44872fe454eaf31b543969630670f3 (patch) | |
| tree | c657ba5ee86a0f2021388bd4ff08e3b3a80dae4e /user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch | |
| parent | d7c07ebaf84058b90112193bf3953289c280a1a6 (diff) | |
| parent | bdb273539df454bdd85dcfb37f7c0135d33477f8 (diff) | |
| download | packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.gz packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.bz2 packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.xz packages-7f660eb77c44872fe454eaf31b543969630670f3.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.37.0
See merge request adelie/packages!270
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 f6a0ddb6b..492dbf7ec 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 c5fd39c8da01cdb0fea0e323937abcf4895b7511 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/16] 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 2e9df48d000..f5ced5b16ed 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -1098,8 +1098,7 @@ impl<'a> Builder<'a> { +@@ -1138,8 +1138,7 @@ impl<'a> Builder<'a> { if let Ok(cxx) = self.cxx(target) { let cxx = ccacheify(&cxx); cargo |