summaryrefslogtreecommitdiff
path: root/user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-11-15 01:52:22 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-11-15 01:52:22 +0000
commit097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch)
treedaa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
parent950827890cca5caf633480047da6115f43b1a529 (diff)
parent18b490b7953735328501c6f7e54522a91220caf3 (diff)
downloadpackages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1 See merge request !105
Diffstat (limited to 'user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch')
-rw-r--r--user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
new file mode 100644
index 000000000..92bace266
--- /dev/null
+++ b/user/rust/0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
@@ -0,0 +1,37 @@
+From 294a9feda6b101466e9ca1646bc3c802afcbe36a Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 16 Sep 2018 16:40:04 +0000
+Subject: [PATCH 13/24] runtest: Fix proc-macro tests on musl hosts
+
+---
+ src/tools/compiletest/src/runtest.rs | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
+index 2d49c83edb..f19aaf54f0 100644
+--- a/src/tools/compiletest/src/runtest.rs
++++ b/src/tools/compiletest/src/runtest.rs
+@@ -1507,7 +1507,6 @@ impl<'test> TestCx<'test> {
+ None
+ } else if self.config.target.contains("cloudabi")
+ || self.config.target.contains("emscripten")
+- || (self.config.target.contains("musl") && !aux_props.force_host)
+ || self.config.target.contains("wasm32")
+ {
+ // We primarily compile all auxiliary libraries as dynamic libraries
+@@ -1515,10 +1514,8 @@ impl<'test> TestCx<'test> {
+ // for the test suite (otherwise including libstd statically in all
+ // executables takes up quite a bit of space).
+ //
+- // For targets like MUSL or Emscripten, however, there is no support for
+- // dynamic libraries so we just go back to building a normal library. Note,
+- // however, that for MUSL if the library is built with `force_host` then
+- // it's ok to be a dylib as the host should always support dylibs.
++ // For targets like Emscripten, however, there is no support for
++ // dynamic libraries so we just go back to building a normal library.
+ Some("lib")
+ } else {
+ Some("dylib")
+--
+2.18.0
+