diff options
author | Samuel Holland <samuel@sholland.org> | 2019-03-21 22:34:00 -0500 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2019-03-22 23:28:00 -0500 |
commit | fd100f124927cd65cf821bd5d538815e81034c1b (patch) | |
tree | 380911715310d268c8c085a5f30f45f9195dd485 /user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch | |
parent | edffe262c383c979833766a85cd65b74fb5231fa (diff) | |
download | packages-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/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch')
-rw-r--r-- | user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch deleted file mode 100644 index c8b2529d8..000000000 --- a/user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 050dfd0e91b92cb350ca52599266cefc6c765106 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sun, 16 Sep 2018 16:40:04 +0000 -Subject: [PATCH 12/23] 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 a80bbd401a..bbe0a6fb7a 100644 ---- a/src/tools/compiletest/src/runtest.rs -+++ b/src/tools/compiletest/src/runtest.rs -@@ -1582,7 +1582,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 -@@ -1590,10 +1589,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.19.2 - |