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/0002-Fix-LLVM-build.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/0002-Fix-LLVM-build.patch')
| -rw-r--r-- | user/rust/0002-Fix-LLVM-build.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch index 8b035a02d..83091f46b 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From 1359f28a3d69943ff8bcd28d0dcca4c68200ff6a Mon Sep 17 00:00:00 2001 +From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:04:29 -0500 -Subject: [PATCH 02/13] Fix LLVM build +Subject: [PATCH 02/16] Fix LLVM build --- src/bootstrap/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index fb60b470a3..71ca61d97e 100644 +index 4d297fa918a..867df81d972 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -783,7 +783,8 @@ impl Build { +@@ -769,7 +769,8 @@ impl Build { // cc-rs because the build scripts will determine that for themselves. let mut base = self.cc[&target].args().iter() .map(|s| s.to_string_lossy().into_owned()) |