diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
| commit | c30463643e0f18200197fa7fc700805eac4d020c (patch) | |
| tree | 599f32d5195512f7b700bb1f68abdbda7ee45281 /user/rust/0002-Fix-LLVM-build.patch | |
| parent | 3e7e0ccf80173731eef6d51f8a261b6058bfad72 (diff) | |
| parent | 3ad04696702c67ecbb84ee44d20b2489d77d841f (diff) | |
| download | packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.gz packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.bz2 packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.xz packages-c30463643e0f18200197fa7fc700805eac4d020c.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.31.1
This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/
See merge request !131
Diffstat (limited to 'user/rust/0002-Fix-LLVM-build.patch')
| -rw-r--r-- | user/rust/0002-Fix-LLVM-build.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch index 4780ff9a9..6938e0faf 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From 67a4fbe55220b79ea80f3e0588fe77c729a70d3d Mon Sep 17 00:00:00 2001 +From d70cd5b6d304cc1b6d8f245460b27b8b0e0e6869 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/24] Fix LLVM build +Subject: [PATCH 02/23] 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 6b88516bac..055a87efaa 100644 +index ab3d0b5137..30e84bc13f 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -772,7 +772,8 @@ impl Build { +@@ -785,7 +785,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()) @@ -22,5 +22,5 @@ index 6b88516bac..055a87efaa 100644 // If we're compiling on macOS then we add a few unconditional flags -- -2.18.0 +2.19.2 |