diff options
| author | Shiz <hi@shiz.me> | 2017-04-16 15:56:18 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-21 01:44:33 +0200 |
| commit | 3db351aa5647eb4a482e9e008bedcf1a5be51302 (patch) | |
| tree | fe64ea58b55936fc2da3f78eaa48c1703ec6bcf6 /testing/rust/alpine-dont-require-filecheck.patch | |
| parent | e4cc4b79b548e043d635ff35c3e9f2e832be1202 (diff) | |
| download | aports-3db351aa5647eb4a482e9e008bedcf1a5be51302.tar.bz2 aports-3db351aa5647eb4a482e9e008bedcf1a5be51302.tar.xz | |
testing/rust: reorganize patches
This divides up the patches in three logical categories:
- musl-*.patch: musl support patches intended for upstreaming;
- alpine-*.patch: Alpine-specific patches that are likely not upstreamable;
- *.patch: functionality patch that may make it upstream.
Diffstat (limited to 'testing/rust/alpine-dont-require-filecheck.patch')
| -rw-r--r-- | testing/rust/alpine-dont-require-filecheck.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/testing/rust/alpine-dont-require-filecheck.patch b/testing/rust/alpine-dont-require-filecheck.patch new file mode 100644 index 0000000000..6556d82a46 --- /dev/null +++ b/testing/rust/alpine-dont-require-filecheck.patch @@ -0,0 +1,19 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Thu, 06 Apr 2017 12:25:00 +0200 +Subject: [PATCH] Do not require FileCheck + +--- 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() && build.config.codegen_tests { +- panic!("FileCheck executable {:?} does not exist", filecheck); +- } +- + for target in build.config.target.iter() { + // Can't compile for iOS unless we're on OSX + if target.contains("apple-ios") && |