Skip to content

Commit d033e2e

Browse files
committed
Trying to solve issues with macos.
1 parent 5682a5d commit d033e2e

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/benchmark.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
with:
3333
fetch-depth: 0
3434

35+
- name: Export XCode SDK Root
36+
if: matrix.os == 'macos-latest'
37+
run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
38+
3539
# TODO: Add support for NetCore Bench
3640
- name: Set up the environment
3741
run: |

cmake/FindNodeJS.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,19 +541,20 @@ if(NOT NodeJS_LIBRARY)
541541
set(NodeJS_PREFIX)
542542
endif()
543543

544+
set(BUILD_DEBUG)
545+
set(BUILD_DEBUG_ASAN)
546+
544547
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
545-
set(BUILD_DEBUG "--debug")
548+
set(BUILD_DEBUG --debug)
546549

547550
if(OPTION_BUILD_ADDRESS_SANITIZER)
548-
set(BUILD_DEBUG "${BUILD_DEBUG} --enable-asan")
551+
set(BUILD_DEBUG_ASAN --enable-asan)
549552
endif()
550-
else()
551-
set(BUILD_DEBUG)
552553
endif()
553554

554555
execute_process(
555556
WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}"
556-
COMMAND ${ICU_ENV_VAR} ./configure ${NodeJS_PREFIX} ${BUILD_ICU_FLAGS} --shared ${BUILD_DEBUG}
557+
COMMAND ${ICU_ENV_VAR} ./configure ${NodeJS_PREFIX} ${BUILD_ICU_FLAGS} --shared ${BUILD_DEBUG} ${BUILD_DEBUG_ASAN}
557558
)
558559

559560
message(STATUS "Build NodeJS shared library")

0 commit comments

Comments
 (0)