fa4de5dd3a
This brings in a batch of template changes, including: - We are now using python3 - Cleaned up distfiles fetching section (clearer, shorter) - Binary distfiles now use standard install.sh scripts - Imported various patches from Adélie Linux - We are now using config.toml instead of configure - Other assorted changes
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 0401335b6e3724d4868c9c4b556f586c7fcf60b8 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Sat, 6 Jul 2019 17:49:18 +0200
|
|
Subject: [PATCH 07/12] runtest: Fix proc-macro tests on musl hosts
|
|
|
|
---
|
|
src/tools/compiletest/src/runtest.rs | 9 ++-------
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
|
|
index 2082de7cb..03c7a4c58 100644
|
|
--- a/src/tools/compiletest/src/runtest.rs
|
|
+++ b/src/tools/compiletest/src/runtest.rs
|
|
@@ -1649,9 +1649,6 @@ impl<'test> TestCx<'test> {
|
|
(true, None)
|
|
} else if self.config.target.contains("cloudabi")
|
|
|| self.config.target.contains("emscripten")
|
|
- || (self.config.target.contains("musl")
|
|
- && !aux_props.force_host
|
|
- && !self.config.host.contains("musl"))
|
|
|| self.config.target.contains("wasm32")
|
|
|| self.config.target.contains("nvptx")
|
|
{
|
|
@@ -1660,10 +1657,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.
|
|
(false, Some("lib"))
|
|
} else {
|
|
(true, Some("dylib"))
|
|
--
|
|
2.22.0
|
|
|