Merge pull request wasmerio#3552 from wasmerio/link-headless

create-exe: link with libwasmer-headless
arunnadesh · Jan 30, 2023 · a90b82a · a90b82a
2 parents 6e850db + b73f4a2
commit a90b82a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -190,7 +190,7 @@ jobs:
         build-what: [
           {
             key: capi,
-            build-cmd: 'make build-capi && make package-capi && make tar-capi',
+            build-cmd: 'make build-capi && make build-capi-headless && make package-capi && make tar-capi',
             name: 'Build and test C-API'
           },
           {
@@ -530,7 +530,7 @@ jobs:
   test_integration_cli: 
     name: CLI integration tests on ${{ matrix.build }}
     runs-on: ${{ matrix.os }}
-    needs: [build]
+    needs: [build, build_linux_aarch64]
     strategy:
       fail-fast: false
       matrix:

diff --git a/Makefile b/Makefile
@@ -452,10 +452,10 @@ build-capi-llvm-universal:
 build-capi-headless:
 ifeq ($(CARGO_TARGET_FLAG),)
 	RUSTFLAGS="${RUSTFLAGS} -C panic=abort -C link-dead-code -C lto -O -C embed-bitcode=yes" $(CARGO_BINARY) build --target $(HOST_TARGET) --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features compiler-headless,wasi,webc_runner  --target-dir target/$(CARGO_TARGET)/headless
+		--no-default-features --features compiler-headless,wasi,webc_runner  --target-dir target/headless
 else
 	RUSTFLAGS="${RUSTFLAGS} -C panic=abort -C link-dead-code -C lto -O -C embed-bitcode=yes" $(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features compiler-headless,wasi,webc_runner --target-dir target/$(CARGO_TARGET)/headless
+		--no-default-features --features compiler-headless,wasi,webc_runner --target-dir target/headless
 endif
 
 build-capi-headless-ios:
@@ -561,7 +561,7 @@ test-wasi-unit:
 test-wasi:
 	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --release --tests $(compiler_features) -- wasi::wasitests
 
-test-integration-cli: build-wasmer build-capi package dist
+test-integration-cli: build-wasmer build-capi package distribution
 	cp ./dist/wasmer.tar.gz ./link.tar.gz
 	rustup target add wasm32-wasi
 	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --features webc_runner --no-fail-fast -p wasmer-integration-tests-cli -- --nocapture --test-threads=1
@@ -727,7 +727,7 @@ package-docs: build-docs build-docs-capi
 	echo '<meta http-equiv="refresh" content="0; url=crates/wasmer/index.html">' > package/docs/index.html
 	echo '<meta http-equiv="refresh" content="0; url=wasmer/index.html">' > package/docs/crates/index.html
 
-package: package-wasmer package-minimal-headless-wasmer package-capi
+package: package-wasmer package-minimal-headless-wasmer package-capi package-capi-headless
 
 tar-capi:
 	ls -R package

diff --git a/lib/cli/src/commands/create_exe.rs b/lib/cli/src/commands/create_exe.rs
@@ -1757,11 +1757,17 @@ pub(super) mod utils {
         target: &Triple,
         files: &[PathBuf],
     ) -> Result<PathBuf, anyhow::Error> {
-        let a = OsStr::new("libwasmer.a");
-        let b = OsStr::new("wasmer.lib");
-        files
+        let target_files = &[
+            OsStr::new("libwasmer-headless.a"),
+            OsStr::new("wasmer-headless.lib"),
+            OsStr::new("libwasmer.a"),
+            OsStr::new("wasmer.lib"),
+        ];
+        target_files
         .iter()
-        .find(|f| f.file_name() == Some(a) || f.file_name() == Some(b))
+        .find_map(|q| {
+            files.iter().find(|f| f.file_name() == Some(*q))
+        })
         .cloned()
         .ok_or_else(|| {
             anyhow!("Could not find libwasmer.a for {} target in the provided tarball path (files = {files:#?})", target)

diff --git a/tests/integration/cli/tests/create_exe.rs b/tests/integration/cli/tests/create_exe.rs
@@ -78,11 +78,17 @@ impl WasmerCreateExe {
 
         let output = output.output()?;
 
+        let stdout = std::str::from_utf8(&output.stdout)
+            .expect("stdout is not utf8! need to handle arbitrary bytes");
+
+        assert!(
+            stdout.contains("headless."),
+            "create-exe stdout should link with libwasmer-headless"
+        );
+
         if !output.status.success() {
             bail!(
-                "{cmd}\r\n failed with: stdout: {}\n\nstderr: {}",
-                std::str::from_utf8(&output.stdout)
-                    .expect("stdout is not utf8! need to handle arbitrary bytes"),
+                "{cmd}\r\n failed with: stdout: {stdout}\n\nstderr: {}",
                 std::str::from_utf8(&output.stderr)
                     .expect("stderr is not utf8! need to handle arbitrary bytes")
             );