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>2018-11-10 22:34:26 +0000
committerSamuel Holland <samuel@sholland.org>2018-11-13 02:03:14 +0000
commit18b490b7953735328501c6f7e54522a91220caf3 (patch)
treef075f78e11183fb78348b69d07affde16b828d81 /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
parent939576404a1853bf009789059c34288420bfd6ec (diff)
downloadpackages-18b490b7953735328501c6f7e54522a91220caf3.tar.gz
packages-18b490b7953735328501c6f7e54522a91220caf3.tar.bz2
packages-18b490b7953735328501c6f7e54522a91220caf3.tar.xz
packages-18b490b7953735328501c6f7e54522a91220caf3.zip
user/rust: Bump to 1.30.1
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, 0 insertions, 37 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
deleted file mode 100644
index 745c5a45f..000000000
--- a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d77940e640855aed389af02a95db7958375785e1 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/29] 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 ce7828144c..ec48fd2d85 100644
---- a/src/tools/compiletest/src/runtest.rs
-+++ b/src/tools/compiletest/src/runtest.rs
-@@ -1509,7 +1509,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
-@@ -1517,10 +1516,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
-