Skip to content

Commit 04ce26a

Browse files
committed
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.
1 parent 3f88091 commit 04ce26a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,9 +1368,10 @@ impl<'test> TestCx<'test> {
13681368

13691369
let crate_type = if aux_props.no_prefer_dynamic {
13701370
None
1371-
} else if (self.config.target.contains("musl") && !aux_props.force_host)
1372-
|| self.config.target.contains("wasm32")
1371+
} else if self.config.target.contains("cloudabi")
13731372
|| self.config.target.contains("emscripten")
1373+
|| (self.config.target.contains("musl") && !aux_props.force_host)
1374+
|| self.config.target.contains("wasm32")
13741375
{
13751376
// We primarily compile all auxiliary libraries as dynamic libraries
13761377
// to avoid code size bloat and large binaries as much as possible

0 commit comments

Comments
 (0)