From 04ce26a6f6a91a63255d37e5550e5ff4a9ed28ff Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Tue, 2 Jan 2018 14:18:40 +0100 Subject: [PATCH] Force the creation of libs instead of dylibs on CloudABI. CloudABI doesn't support the creation of dynamic libraries. Any test making use of auxiliary libraries will fail without this change applied. --- src/tools/compiletest/src/runtest.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index aceb472ca631..1b87576ba0b0 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1368,9 +1368,10 @@ impl<'test> TestCx<'test> { let crate_type = if aux_props.no_prefer_dynamic { None - } else if (self.config.target.contains("musl") && !aux_props.force_host) - || self.config.target.contains("wasm32") + } 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 // to avoid code size bloat and large binaries as much as possible