Use zig wrapper for compilation

Author: richarddavison

.cargo/config.toml

@@ -1,6 +1,26 @@
+[target.aarch64-unknown-linux-musl]
+rustflags = [
+    "-Zpre-link-args=-target aarch64-linux-musl",
+    "-Ctarget-feature=+lse,+crt-static",
+    "-Ctarget-cpu=neoverse-n1",
+]
+linker = "./zigcc"
+ar = "zig ar"
+
+[target.x86_64-unknown-linux-musl]
+rustflags = [
+    "-Zpre-link-args=-target x86_64-linux-musl",
+    "-Ctarget-feature=+crt-static",
+]
+linker = "./zigcc"
+ar = "zig ar"
+
 [unstable]
 build-std = ["core", "compiler_builtins", "alloc", "std", "panic_abort"]
 build-std-features = ["panic_immediate_abort"]
 
-# [target.aarch64-unknown-linux-musl]
-# rustflags = ["-Ctarget-feature=+lse,+crt-static", "-Ctarget-cpu=neoverse-n1"]
+[env]
+CC_aarch64_unknown_linux_musl = "zig cc -target aarch64-linux-musl"
+CXX_aarch64_unknown_linux_musl = "zig cc -target aarch64-linux-musl"
+CC_x86_64_unknown_linux_musl = "zig cc -target x86_64-linux-musl"
+CXX_x86_64_unknown_linux_musl = "zig cc -target x86_64-linux-musl"

.github/workflows/build.yml

@@ -56,21 +56,18 @@ jobs:
         uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: nightly
-      # - name: Cargo cache
-      #   uses: actions/cache@v4
-      #   continue-on-error: false
-      #   with:
-      #     path: |
-      #       ~/.cargo/bin/
-      #       ~/.cargo/registry/index/
-      #       ~/.cargo/registry/cache/
-      #       ~/.cargo/git/db/
-      #       target/
-      #     key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      #     restore-keys: ${{ runner.os }}-cargo-
-      - name: Install cargo-zigbuild
-        run: |
-          cargo install cargo-zigbuild || true
+      - name: Cargo cache
+        uses: actions/cache@v4
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
       - name: Run tests
         if: inputs.arch != 'aarch64' || inputs.platform != 'linux'
         run: |

Makefile

@@ -4,15 +4,13 @@ TARGET_darwin_x86_64 = x86_64-apple-darwin
 TARGET_darwin_arm64 = aarch64-apple-darwin
 RUST_VERSION = nightly
 TOOLCHAIN = +$(RUST_VERSION)
-ZIGBUILD_ARG = $(TOOLCHAIN) zigbuild -r
 BUILD_ARG = $(TOOLCHAIN) build -r
 BUILD_DIR = ./target/release
 BUNDLE_DIR = bundle
 ZSTD_LIB_ARGS = -j lib-nomt UNAME=Linux ZSTD_LIB_COMPRESSION=0 ZSTD_LIB_DICTBUILDER=0 AR="zig ar"
 ZSTD_LIB_CC_ARGS = -s -O3 -flto
 ZSTD_LIB_CC_arm64 = CC="zig cc -target aarch64-linux-musl $(ZSTD_LIB_CC_ARGS)" 
 ZSTD_LIB_CC_x64 = CC="zig cc -target aarch64-linux-musl $(ZSTD_LIB_CC_ARGS)"
-CARGO_TEST_CMD = cargo-zigbuild
 
 TS_SOURCES = $(wildcard src/js/*.ts) $(wildcard src/js/@llrt/*.ts) $(wildcard tests/*.ts)
 STD_JS_FILE = $(BUNDLE_DIR)/@llrt/std.js
@@ -54,16 +52,16 @@ llrt-darwin-arm64.zip: | clean-js js
 	zip -j $@ target/$(TARGET_darwin_arm64)/release/llrt
 
 llrt-linux-x64.zip: | clean-js js
-	cargo $(ZIGBUILD_ARG) --target $(TARGET_linux_x86_64)
+	cargo $(BUILD_ARG) --target $(TARGET_linux_x86_64)
 	zip -j $@ target/$(TARGET_linux_x86_64)/release/llrt
 
 llrt-linux-arm64.zip: | clean-js js
-	cargo $(ZIGBUILD_ARG) --target $(TARGET_linux_arm64)
+	cargo $(BUILD_ARG) --target $(TARGET_linux_arm64)
 	zip -j $@ target/$(TARGET_linux_arm64)/release/llrt
 
 define release_template
 release-${1}: | clean-js js
-	cargo $$(ZIGBUILD_ARG) --target $$(TARGET_linux_$$(RELEASE_ARCH_NAME_${1})) --features lambda -vv
+	cargo $$(BUILD_ARG) --target $$(TARGET_linux_$$(RELEASE_ARCH_NAME_${1})) --features lambda -vv
 	./pack target/$$(TARGET_linux_$$(RELEASE_ARCH_NAME_${1}))/release/llrt target/$$(TARGET_linux_$$(RELEASE_ARCH_NAME_${1}))/release/bootstrap
 	@rm -rf llrt-lambda-${1}.zip
 	zip -j llrt-lambda-${1}.zip target/$$(TARGET_linux_$$(RELEASE_ARCH_NAME_${1}))/release/bootstrap index.mjs

example/functions/src/ssr.ts

@@ -147,7 +147,8 @@ const assetResponse = async (path: string) => {
 };
 
 export const handler = async (event: any) => {
-  const { method, path: eventPath } = event?.requestContext?.http || {};
+  const { method = "GET", path: eventPath = "/" } =
+    event?.requestContext?.http || {};
 
   try {
     const reqSegments: string[] = (eventPath as string)

src/vm.rs

@@ -482,8 +482,6 @@ fn json_parse_string<'js>(ctx: Ctx<'js>, value: Value<'js>) -> Result<Value<'js>
 }
 
 fn run_gc(ctx: Ctx<'_>) {
-    println!("ALLOCATED: {:?}", USED_MEM.load(Ordering::Relaxed));
-
     if USED_MEM.load(Ordering::Relaxed) < *GC_THRESHOLD {
         return;
     }

zigcc

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+new_array=()
+for value in "$@"
+do
+    [[ $value != *self-contained/*crt* ]] && new_array+=($value)
+done
+
+zig cc "${new_array[@]}"