From 0fb840702e5c84b9c1fb34fc2d50cd62d43661f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <kraen.hansen@mongodb.com>
Date: Fri, 1 Dec 2023 15:38:29 +0100
Subject: [PATCH] WIP

---
 packages/realm/bindgen/CMakeLists.txt |  6 +-----
 packages/realm/package.json           | 12 +++++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/realm/bindgen/CMakeLists.txt b/packages/realm/bindgen/CMakeLists.txt
index 5df763b612..b78ab42d92 100644
--- a/packages/realm/bindgen/CMakeLists.txt
+++ b/packages/realm/bindgen/CMakeLists.txt
@@ -16,11 +16,7 @@ if(DEFINED CMAKE_JS_VERSION)
         endif()
     elseif(APPLE)
       set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
-      if(NODE_ARCH STREQUAL "arm64")
-        set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
-      else()
-        set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "")
-      endif()
+      # CMAKE_OSX_ARCHITECTURES is defined by cmake-js
     elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
       if(NODE_ARCH STREQUAL "arm")
         set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vendor/realm-core/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake")
diff --git a/packages/realm/package.json b/packages/realm/package.json
index 8802603f78..87820fcaf0 100644
--- a/packages/realm/package.json
+++ b/packages/realm/package.json
@@ -79,6 +79,7 @@
     "build:node:prebuild:arm64": "wireit",
     "build:node:prebuild:x64": "wireit",
     "build:node:prebuild:ia32": "wireit",
+    "build:node:prebuild:universal": "wireit",
     "build:android": "wireit",
     "build:ios": "wireit",
     "build:ios:debug:simulator": "wireit",
@@ -186,8 +187,11 @@
       ]
     },
     "build:node:prebuild": {
-      "command": "cross-env-shell prebuild --runtime napi --arch $PREBUILD_ARCH -- --directory bindgen",
+      "command": "cross-env-shell prebuild --runtime napi --arch '$PREBUILD_ARCH' -- --directory bindgen",
       "env": {
+        "npm_config_nodedir": {
+          "external": true
+        },
         "PREBUILD_ARCH": {
           "external": true
         }
@@ -217,6 +221,12 @@
         "PREBUILD_ARCH": "ia32"
       }
     },
+    "build:node:prebuild:universal": {
+      "command": "npm run build:node:prebuild",
+      "env": {
+        "PREBUILD_ARCH": "x86_64;arm64"
+      }
+    },
     "build:android": {
       "command": "node ../../scripts/build-android.js",
       "files": [