diff options
| author | Ed Schouten <ed@nuxi.nl> | 2018-01-02 14:18:40 +0100 |
|---|---|---|
| committer | Ed Schouten <ed@nuxi.nl> | 2018-01-02 14:18:40 +0100 |
| commit | 04ce26a6f6a91a63255d37e5550e5ff4a9ed28ff (patch) | |
| tree | 2813b7072b71d6b01c2e465bb439f3d41b6e0d7b | |
| parent | 3f880912e90825a88b0a25e235dd43b24da1055b (diff) | |
| download | rust-04ce26a6f6a91a63255d37e5550e5ff4a9ed28ff.tar.gz rust-04ce26a6f6a91a63255d37e5550e5ff4a9ed28ff.zip | |
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.
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index aceb472ca63..1b87576ba0b 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 |
