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-05-26 15:21:24 -0500
committerSamuel Holland <samuel@sholland.org>2019-05-29 04:38:48 +0000
commitd726062dd22ef3eaafd366821fb7c9dde338f060 (patch)
treee443eb75a9559da3b883f3c8d34a3068e46992bb /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
parent0ee2191bdaf224bcc5c9bd4cfd3e42e0fe5fed16 (diff)
downloadpackages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.gz
packages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.bz2
packages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.xz
packages-d726062dd22ef3eaafd366821fb7c9dde338f060.zip
user/rust: Bump to 1.34.2
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.patch8
1 files changed, 4 insertions, 4 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
index 6435eeef0..06eebb9c5 100644
--- 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
@@ -1,4 +1,4 @@
-From e60db771c8ffe7b82a97ca516737cbf40b372e54 Mon Sep 17 00:00:00 2001
+From a7c6bcd4834952f3f5b0483dd71b47407d9fb186 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
@@ -8,10 +8,10 @@ Subject: [PATCH 07/14] runtest: Fix proc-macro tests on musl hosts
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
+index 7781ce74f4..5d73545b1f 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
-@@ -1566,7 +1566,6 @@ impl<'test> TestCx<'test> {
+@@ -1604,7 +1604,6 @@ impl<'test> TestCx<'test> {
None
} else if self.config.target.contains("cloudabi")
|| self.config.target.contains("emscripten")
@@ -19,7 +19,7 @@ index 400c205d44..be5c50b070 100644
|| self.config.target.contains("wasm32")
{
// We primarily compile all auxiliary libraries as dynamic libraries
-@@ -1574,10 +1573,8 @@ impl<'test> TestCx<'test> {
+@@ -1612,10 +1611,8 @@ impl<'test> TestCx<'test> {
// for the test suite (otherwise including libstd statically in all
// executables takes up quite a bit of space).
//