diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:42:59 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:46:40 +0000 |
| commit | 7e1cca3044a2ec11b12b1e0004eb59be38950bed (patch) | |
| tree | 21773e07accb1d9b9c49a95dc2975aa04867c479 /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch | |
| parent | d726062dd22ef3eaafd366821fb7c9dde338f060 (diff) | |
| download | packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.gz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.bz2 packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.xz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.zip | |
user/rust: Bump to 1.35.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.patch | 12 |
1 files changed, 6 insertions, 6 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 06eebb9c5..b8fa40308 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,25 +1,25 @@ -From a7c6bcd4834952f3f5b0483dd71b47407d9fb186 Mon Sep 17 00:00:00 2001 +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/14] runtest: Fix proc-macro tests on musl hosts +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 7781ce74f4..5d73545b1f 100644 +index 2021dd513a..765353620b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs -@@ -1604,7 +1604,6 @@ impl<'test> TestCx<'test> { +@@ -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") { - // We primarily compile all auxiliary libraries as dynamic libraries -@@ -1612,10 +1611,8 @@ impl<'test> TestCx<'test> { +@@ -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). // |