summaryrefslogblamecommitdiff
path: root/user/rust/0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
blob: c8b2529d8f6ab28c0eb7673a3e823562eaa225da (plain) (tree)
1
2
3
4
5
6
7
8
9
10
                                                                      

                                          
                                                                  





                                                                                        
                                   

                                          
                                                 






                                                                                     
                                                  












                                                                                            
      
 
From 050dfd0e91b92cb350ca52599266cefc6c765106 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sun, 16 Sep 2018 16:40:04 +0000
Subject: [PATCH 12/23] 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 a80bbd401a..bbe0a6fb7a 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1582,7 +1582,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
@@ -1590,10 +1589,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.19.2