diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-08 15:08:22 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-09 15:41:28 +0200 |
| commit | 8c89e1295610fdb35dd125c2f7060e2e74c68527 (patch) | |
| tree | 6bd5e94c2f58436db3341b9958354acc3a969d2c /testing/rust/dont-require-filecheck.patch | |
| parent | 997883d3a0f8c8c4a12b55f62643a26883d14507 (diff) | |
| download | aports-8c89e1295610fdb35dd125c2f7060e2e74c68527.tar.bz2 aports-8c89e1295610fdb35dd125c2f7060e2e74c68527.tar.xz | |
testing/rust: upgrade to 1.16.0 and properly fix dynamic linking
Diffstat (limited to 'testing/rust/dont-require-filecheck.patch')
| -rw-r--r-- | testing/rust/dont-require-filecheck.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testing/rust/dont-require-filecheck.patch b/testing/rust/dont-require-filecheck.patch index 430cc9320c..6556d82a46 100644 --- a/testing/rust/dont-require-filecheck.patch +++ b/testing/rust/dont-require-filecheck.patch @@ -1,19 +1,19 @@ From: Jakub Jirutka <jakub@jirutka.cz> -Date: Thu, 04 Aug 2016 17:53:00 +0200 +Date: Thu, 06 Apr 2017 12:25:00 +0200 Subject: [PATCH] Do not require FileCheck ---- a/src/bootstrap/build/sanity.rs -+++ b/src/bootstrap/build/sanity.rs -@@ -76,12 +76,6 @@ - need_cmd(build.cxx(host).as_ref()); +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -144,12 +144,6 @@ + } } - // Externally configured LLVM requires FileCheck to exist - let filecheck = build.llvm_filecheck(&build.config.build); -- if !filecheck.starts_with(&build.out) && !filecheck.exists() { -- panic!("filecheck executable {:?} does not exist", filecheck); +- if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests { +- panic!("FileCheck executable {:?} does not exist", filecheck); - } - for target in build.config.target.iter() { - // Either can't build or don't want to run jemalloc on these targets - if target.contains("rumprun") || + // Can't compile for iOS unless we're on OSX + if target.contains("apple-ios") && |