fix statically linked build

Signed-off-by: Rajat Jindal <rajatjindal83@gmail.com>
rajatjindal · Nov 8, 2023 · 40d3912 · 40d3912
1 parent 7bbc35b
commit 40d3912
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml
@@ -8,7 +8,7 @@ inputs:
     type: bool
   rust-version:
     description: 'Rust version to setup'
-    default: '1.71'
+    default: '1.73'
     required: false
     type: string
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
         if: failure()
         uses: andymckay/cancel-action@0.2
 
-  ## This is separated out to remove e2e-tests dependency on windows/mac builds
+  # This is separated out to remove e2e-tests dependency on windows/mac builds
   build-rust-ubuntu:
     name: Build Spin Ubuntu
     runs-on: ubuntu-latest
@@ -87,10 +87,11 @@ jobs:
           rust-cache: true
 
       - name: Cargo Build
-        run: cross build --target x86_64-unknown-linux-musl --workspace --release --all-targets --features openssl/vendored
+        run: cross build --verbose --target x86_64-unknown-linux-musl --workspace --release --all-targets --features openssl/vendored
         env:
           CARGO_INCREMENTAL: 0
           BUILD_SPIN_EXAMPLES: 0
+          RUSTFLAGS: '-C target-feature=+crt-static -C link-self-contained=yes'
 
       - name: "Archive executable artifact"
         uses: actions/upload-artifact@v3
@@ -112,11 +113,11 @@ jobs:
           rust-cache: true
 
       - name: Cargo Build
-        run: cross build --target aarch64-unknown-linux-musl --workspace --release --all-targets --features openssl/vendored
+        run: cross build --workspace --verbose --release --target aarch64-unknown-linux-musl --features openssl/vendored  --features all-tests
         env:
           CARGO_INCREMENTAL: 0
           BUILD_SPIN_EXAMPLES: 0
-          RUSTFLAGS: '-C target-feature=+fp16'
+          RUSTFLAGS: '-C target-feature=+fp16 -C target-feature=+crt-static -C link-self-contained=yes'
 
       - name: "Archive executable artifact"
         uses: actions/upload-artifact@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,7 +88,7 @@ which = "4.2.5"
 e2e-testing = { path = "crates/e2e-testing" }
 
 [build-dependencies]
-cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "b7b1989fe0984c0f7c4966398304c6538e52fe49" }
+cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
 vergen = { version = "^8.2.1", default-features = false, features = [
   "build",
   "git",

diff --git a/cross/Dockerfile b/cross/Dockerfile
@@ -2,3 +2,8 @@ ARG CROSS_BASE_IMAGE
 FROM $CROSS_BASE_IMAGE
 
 RUN --mount=type=bind,source=/,target=/polyfill /polyfill/polyfill.sh
+
+RUN apt-get -y update && \
+    apt-get install -y pkg-config protobuf-compiler
+
+