diff options
author | Samuel Holland <samuel@sholland.org> | 2018-09-19 02:31:46 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-25 00:08:16 +0000 |
commit | cd980d29292f8f5d6bb8bef5773ce91b95bfb90a (patch) | |
tree | 7eeb0fd1825894538eea675625a9f3009f3fca9d /user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch | |
parent | 63266fdc6f2014cc6dfd0f983e13de7c378bc708 (diff) | |
download | packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.gz packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.bz2 packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.xz packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.zip |
user/rust: new package
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 | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 000000000..102e2e3a9 --- /dev/null +++ b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch @@ -0,0 +1,37 @@ +From 30a10fccca71d84e696bf907621c30f66eb708e6 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/28] 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 + |