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-07-05 23:26:12 -0500
committerSamuel Holland <samuel@sholland.org>2019-09-05 02:05:29 +0000
commit7ff61b754950fa82d16e1bcbb458c54a38598f2a (patch)
tree15c91da7a3615df6c9dc7dad00b50ba4ddb813d7 /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
parent1c147dccb8b8b31fbc830e963f301e99ebc25d8d (diff)
downloadpackages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.gz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.bz2
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.xz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.zip
user/rust: Bump to 1.36.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
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 b8fa40308..000000000
--- a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cd7484e89d44ad980a526eb993c5cbc2b7f0878a 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/13] 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 2021dd513a..765353620b 100644
---- a/src/tools/compiletest/src/runtest.rs
-+++ b/src/tools/compiletest/src/runtest.rs
-@@ -1605,7 +1605,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")
- || self.config.target.contains("nvptx")
- {
-@@ -1614,10 +1613,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
-