Skip to content

Commit b1f1488

Browse files
committed
arst
1 parent a18ecb4 commit b1f1488

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/actions/v8/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ runs:
8989
export CLANG_BASE_PATH=$(brew --cellar llvm)/$(brew list --versions llvm | cut -d' ' -f2 | sort -V | head -n1)
9090
;;
9191
win32)
92+
export CLANG_BASE_PATH=$(dirname $(which clang))/..
9293
export DEPOT_TOOLS_WIN_TOOLCHAIN=0
9394
;;
9495
esac

.github/workflows/build-test-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ jobs:
175175
# `CMD.EXE` and does not work with the cmake Ninja generator.
176176
/c/msys64/usr/bin/pacman -S --noconfirm \
177177
mingw-w64-x86_64-boost \
178+
mingw64/mingw-w64-x86_64-cmake \
178179
mingw64/mingw-w64-x86_64-ninja \
179180
;
180181
echo "/c/msys64/mingw64/bin" >> "$GITHUB_PATH"
@@ -194,6 +195,8 @@ jobs:
194195
195196
# Install nodejs & npm dependencies
196197
- uses: actions/setup-node@v4
198+
with:
199+
node-version: 24
197200
- uses: pnpm/action-setup@v4
198201
- name: Install
199202
run: pnpm install --frozen-lockfile

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function(target_embed_content TARGET)
139139
add_custom_command(
140140
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}"
141141
OUTPUT "${GEN_DIR}/${FILE}.c" "${GEN_DIR}/${FILE}.h"
142-
COMMAND "${PROJECT_SOURCE_DIR}/embed.sh" "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}" "${GEN_DIR}/${FILE}" ${IDENTIFIER}
142+
COMMAND sh -C "${PROJECT_SOURCE_DIR}/embed.sh" "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}" "${GEN_DIR}/${FILE}" ${IDENTIFIER}
143143
)
144144
set_source_files_properties("${GEN_DIR}/${FILE}.c" PROPERTIES GENERATED TRUE)
145145
target_sources(${TARGET} PRIVATE "${GEN_DIR}/${FILE}.c")
@@ -175,7 +175,7 @@ function(target_preprocessed_sources TARGET SEARCH REPLACE)
175175
add_custom_command(
176176
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}"
177177
OUTPUT "${GEN_DIR}/${FILE}"
178-
COMMAND "${PROJECT_SOURCE_DIR}/scripts/cmake/expand_def" "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}" "-D${SEARCH}=${REPLACE}" > "${GEN_DIR}/${FILE}"
178+
COMMAND sh -C "${PROJECT_SOURCE_DIR}/scripts/cmake/expand_def" "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}" "-D${SEARCH}=${REPLACE}" > "${GEN_DIR}/${FILE}"
179179
)
180180
set_source_files_properties("${GEN_DIR}/${FILE}" PROPERTIES GENERATED TRUE)
181181
target_sources(${TARGET} ${SCOPE} "${GEN_DIR}/${FILE}")

packages/backend_napi_v8/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ target_link_libraries(ivm_backend_v8 PUBLIC
3232

3333
# Windows linking
3434
if (WIN32)
35-
target_link_directories(ivm_backend_v8 PUBLIC ${NODE_DIST_DIR}/node/windows/${IVM_HOST_ARCH})
35+
target_link_directories(ivm_backend_v8 PUBLIC ${NODE_DIST_DIR}/windows/${IVM_HOST_ARCH})
3636
target_link_libraries(ivm_backend_v8 PUBLIC node dbghelp winmm)
3737
endif()
3838

0 commit comments

Comments
 (0)