Trying to solve issues with macos.

metacall · Apr 3, 2024 · d033e2e · d033e2e
1 parent 5682a5d
commit d033e2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -32,6 +32,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Export XCode SDK Root
+        if: matrix.os == 'macos-latest'
+        run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
+
       # TODO: Add support for NetCore Bench
       - name: Set up the environment
         run: |

diff --git a/cmake/FindNodeJS.cmake b/cmake/FindNodeJS.cmake
@@ -541,19 +541,20 @@ if(NOT NodeJS_LIBRARY)
 				set(NodeJS_PREFIX)
 			endif()
 
+			set(BUILD_DEBUG)
+			set(BUILD_DEBUG_ASAN)
+
 			if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-				set(BUILD_DEBUG "--debug")
+				set(BUILD_DEBUG --debug)
 
 				if(OPTION_BUILD_ADDRESS_SANITIZER)
-					set(BUILD_DEBUG "${BUILD_DEBUG} --enable-asan")
+					set(BUILD_DEBUG_ASAN --enable-asan)
 				endif()
-			else()
-				set(BUILD_DEBUG)
 			endif()
 
 			execute_process(
 				WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}"
-				COMMAND ${ICU_ENV_VAR} ./configure ${NodeJS_PREFIX} ${BUILD_ICU_FLAGS} --shared ${BUILD_DEBUG}
+				COMMAND ${ICU_ENV_VAR} ./configure ${NodeJS_PREFIX} ${BUILD_ICU_FLAGS} --shared ${BUILD_DEBUG} ${BUILD_DEBUG_ASAN}
 			)
 
 			message(STATUS "Build NodeJS shared library")