fixup

Kong · Jan 31, 2024 · 4037638 · 4037638
1 parent 386b690
commit 4037638
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -390,6 +390,7 @@ jobs:
       WASMTIME_VER: ${{ needs.setup.outputs.wasmtime_ver }}
       WASMER_VER: ${{ needs.setup.outputs.wasmer_ver }}
       V8_VER: ${{ needs.setup.outputs.v8_ver }}
+      NGX_WASM_RUNTIME_V8_NEEDS_LIBATOMIC: 0
     steps:
       - uses: actions/checkout@v3
       - name: Setup dependencies

diff --git a/Makefile b/Makefile
@@ -40,6 +40,7 @@ export NGX_WASM_RUNTIME_INC ?=
 export NGX_WASM_RUNTIME_LIB ?=
 export NGX_WASM_RUNTIME_LD_OPT ?=
 export NGX_WASM_RUNTIME_NO_RPATH ?= 0
+export NGX_WASM_RUNTIME_V8_NEEDS_LIBATOMIC ?= 1
 export NGX_WASM_CARGO ?= 1
 export NGX_WASM_CARGO_PROFILE ?= debug
 

diff --git a/config b/config
@@ -31,7 +31,11 @@ case $ngx_wasm_runtime_name in
         ngx_wasm_runtime_srcs="$ngx_addon_dir/src/wasm/wrt/ngx_wrt_v8.c"
         ngx_wasm_runtime_lib_name="wee8"
         ngx_wasm_runtime_pre_libs="-lv8bridge"
-        ngx_wasm_runtime_post_libs="-ldl -lm -lpthread -lstdc++ -latomic"
+        ngx_wasm_runtime_post_libs="-ldl -lm -lpthread -lstdc++"
+
+        if [ "$NGX_WASM_RUNTIME_V8_NEEDS_LIBATOMIC" = 1 ]; then
+            ngx_wasm_runtime_post_libs="-ldl -lm -lpthread -lstdc++ -latomic"
+        fi
 
         ngx_wasm_cargo_lib_name=ngx_wasm_rs
         ngx_wasm_cargo_lib_dir=$ngx_addon_dir/lib/ngx-wasm-rs