summaryrefslogtreecommitdiff
path: root/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-03-21 22:34:00 -0500
committerSamuel Holland <samuel@sholland.org>2019-03-22 23:28:00 -0500
commitfd100f124927cd65cf821bd5d538815e81034c1b (patch)
tree380911715310d268c8c085a5f30f45f9195dd485 /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
parentedffe262c383c979833766a85cd65b74fb5231fa (diff)
downloadpackages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.gz
packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.bz2
packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.xz
packages-fd100f124927cd65cf821bd5d538815e81034c1b.zip
user/rust: Bump to 1.33.0
Diffstat (limited to 'user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch')
-rw-r--r--user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
new file mode 100644
index 000000000..6435eeef0
--- /dev/null
+++ b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
@@ -0,0 +1,37 @@
+From e60db771c8ffe7b82a97ca516737cbf40b372e54 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 16 Sep 2018 16:40:04 +0000
+Subject: [PATCH 07/14] 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 400c205d44..be5c50b070 100644
+--- a/src/tools/compiletest/src/runtest.rs
++++ b/src/tools/compiletest/src/runtest.rs
+@@ -1566,7 +1566,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
+@@ -1574,10 +1573,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.21.0
+