diff --git a/Makefile b/Makefile index d0af1ab..b4d7c62 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ NAPI_NATIVE_TEST_OUT_DIR ?= $(abspath $(BUILD_WASIX_NAPI_DIR)/native) NAPI_WASIX_TEST_OUT_DIR ?= $(abspath $(BUILD_WASIX_NAPI_DIR)/wasm32-wasix/release) NAPI_V8_CTEST_ARGS ?= -E 'SandboxGlobalThisAndMarkerAreNotEnumerableForDeepFreeze' NAPI_QUICKJS_CTEST_ARGS ?= -E 'SandboxGlobalThisAndMarkerAreNotEnumerableForDeepFreeze' -NAPI_V8_PREBUILT_VERSION ?= 11.9.7 +NAPI_V8_PREBUILT_VERSION ?= 11.9.8 NAPI_V8_PLATFORM := NAPI_V8_DIST_ROOT ?= NAPI_V8_CARGO_DIST_ROOT ?= @@ -37,6 +37,8 @@ endif else ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_M),x86_64) NAPI_V8_PLATFORM := linux-amd64 +else ifeq ($(UNAME_M),aarch64) +NAPI_V8_PLATFORM := linux-arm64 endif endif ifeq ($(NAPI_V8_DIST_ROOT),) diff --git a/build.rs b/build.rs index 24cb7d1..ec9129a 100644 --- a/build.rs +++ b/build.rs @@ -4,7 +4,7 @@ use std::{ path::{Path, PathBuf}, }; -const PREBUILT_V8_VERSION: &str = "11.9.7"; +const PREBUILT_V8_VERSION: &str = "11.9.8"; #[derive(Debug, Clone, Copy, PartialEq, Eq)] enum V8Method { @@ -391,6 +391,7 @@ fn prebuilt_asset_name() -> Result<(&'static str, &'static str), String> { ("macos", "aarch64", _) => Ok(("v8-darwin-aarch64.tar.xz", "darwin-arm64")), ("macos", "x86_64", _) => Ok(("v8-darwin-amd64.tar.xz", "darwin-amd64")), ("linux", "x86_64", "gnu") => Ok(("v8-linux-amd64.tar.xz", "linux-amd64")), + ("linux", "aarch64", "gnu") => Ok(("v8-linux-arm64.tar.xz", "linux-arm64")), ("linux", "x86_64", "musl") => Ok(("v8-linux-musl-amd64.tar.xz", "linux-musl-amd64")), ("android", "aarch64", _) => Ok(("v8-android-arm64.tar.xz", "android-arm64")), ("windows", "x86_64", _) => Ok(("v8-windows-amd64.tar.xz", "windows-amd64")), diff --git a/tests/build-test-native.sh b/tests/build-test-native.sh index f98cc4c..f8a0d29 100755 --- a/tests/build-test-native.sh +++ b/tests/build-test-native.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -PREBUILT_V8_VERSION="11.9.7" +PREBUILT_V8_VERSION="11.9.8" if [[ $# -ne 1 ]]; then echo "usage: $0 " >&2 @@ -84,6 +84,9 @@ resolve_cached_prebuilt_v8() { linux/x86_64) platform_name="linux-amd64" ;; + linux/aarch64) + platform_name="linux-arm64" + ;; *) return 1 ;; diff --git a/v8/cmake/NapiV8Resolver.cmake b/v8/cmake/NapiV8Resolver.cmake index f340541..109c63f 100644 --- a/v8/cmake/NapiV8Resolver.cmake +++ b/v8/cmake/NapiV8Resolver.cmake @@ -1,4 +1,4 @@ -set(NAPI_V8_PREBUILT_VERSION "11.9.2") +set(NAPI_V8_PREBUILT_VERSION "11.9.8") set(NAPI_V8_PREBUILT_BASE_URL "https://github.com/wasmerio/v8-custom-builds/releases/download/${NAPI_V8_PREBUILT_VERSION}") @@ -109,7 +109,15 @@ function(_napi_v8_prebuilt_strategy out_ok out_include out_library out_extra out if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")) set(_platform "darwin-arm64") - set(_asset "v8-darwin-arm64.tar.xz") + set(_asset "v8-darwin-aarch64.tar.xz") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND + (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")) + set(_platform "darwin-amd64") + set(_asset "v8-darwin-amd64.tar.xz") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND + (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")) + set(_platform "linux-arm64") + set(_asset "v8-linux-arm64.tar.xz") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")) set(_platform "linux-amd64")