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/0002-Fix-LLVM-build.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/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 83091f46b..25d8355fc 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001 +From 02bae9a59de4e38001272219b8a9909549c12df8 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/16] Fix LLVM build +Subject: [PATCH 02/18] 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 4d297fa918a..867df81d972 100644 +index b72aa78f3de..3374c88550a 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -769,7 +769,8 @@ impl Build { +@@ -768,7 +768,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()) |