ci: provide separate macos releases for intel and arm

This will immensely reduce the complexity required to support both
architectures, reduce overall lines of code and unblock follow-up
simplifications.

11 files changed, 4 insertions, 55 deletions

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index c80a826f96..29127dc811 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -8,7 +8,6 @@ if(MSVC)
     CMAKE_ARGS ${DEPS_CMAKE_ARGS}
       -D LIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
       -D LIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
-    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
     ${EXTERNALPROJECT_OPTIONS})
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
diff --git a/cmake.deps/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake
index 93dc251166..13126dc916 100644
--- a/cmake.deps/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
@@ -6,7 +6,6 @@ if(MSVC)
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt
       ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
     CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
     ${EXTERNALPROJECT_OPTIONS})
 else()
   message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
diff --git a/cmake.deps/cmake/BuildLibuv.cmake b/cmake.deps/cmake/BuildLibuv.cmake
index aacee9fd4a..6f241f63f6 100644
--- a/cmake.deps/cmake/BuildLibuv.cmake
+++ b/cmake.deps/cmake/BuildLibuv.cmake
@@ -6,5 +6,4 @@ ExternalProject_Add(libuv
     -D BUILD_TESTING=OFF
     -D LIBUV_BUILD_SHARED=OFF
     -D UV_LINT_W4=OFF
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
diff --git a/cmake.deps/cmake/BuildLibvterm.cmake b/cmake.deps/cmake/BuildLibvterm.cmake
index a3b59d9374..3415d8debe 100644
--- a/cmake.deps/cmake/BuildLibvterm.cmake
+++ b/cmake.deps/cmake/BuildLibvterm.cmake
@@ -5,5 +5,4 @@ ExternalProject_Add(libvterm
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt
     ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt
   CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
diff --git a/cmake.deps/cmake/BuildLpeg.cmake b/cmake.deps/cmake/BuildLpeg.cmake
index a8455a9976..2dd9d62968 100644
--- a/cmake.deps/cmake/BuildLpeg.cmake
+++ b/cmake.deps/cmake/BuildLpeg.cmake
@@ -5,7 +5,6 @@ ExternalProject_Add(lpeg
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LpegCMakeLists.txt
     ${DEPS_BUILD_DIR}/src/lpeg/CMakeLists.txt
   CMAKE_ARGS ${DEPS_CMAKE_ARGS} -DCMAKE_C_FLAGS=${DEPS_INCLUDE_FLAGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
 
 if(USE_BUNDLED_LUAJIT)
diff --git a/cmake.deps/cmake/BuildLuajit.cmake b/cmake.deps/cmake/BuildLuajit.cmake
index c5068d6986..8182afcd7d 100644
--- a/cmake.deps/cmake/BuildLuajit.cmake
+++ b/cmake.deps/cmake/BuildLuajit.cmake
@@ -4,16 +4,13 @@
 function(BuildLuajit)
   cmake_parse_arguments(_luajit
     ""
-    "TARGET"
+    ""
     "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;DEPENDS"
     ${ARGN})
-  if(NOT _luajit_TARGET)
-    set(_luajit_TARGET "luajit")
-  endif()
 
   get_externalproject_options(luajit ${DEPS_IGNORE_SHA})
-  ExternalProject_Add(${_luajit_TARGET}
-    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${_luajit_TARGET}
+  ExternalProject_Add(luajit
+    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luajit
     CONFIGURE_COMMAND "${_luajit_CONFIGURE_COMMAND}"
     BUILD_IN_SOURCE 1
     BUILD_COMMAND "${_luajit_BUILD_COMMAND}"
@@ -47,49 +44,11 @@ if(APPLE)
   set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
 endif()
 
-if((UNIX AND NOT APPLE) OR (APPLE AND NOT CMAKE_OSX_ARCHITECTURES))
+if(UNIX)
   BuildLuaJit(INSTALL_COMMAND ${BUILDCMD_UNIX}
     CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR}
     ${DEPLOYMENT_TARGET} install)
 
-elseif(CMAKE_OSX_ARCHITECTURES AND APPLE)
-
-  set(LUAJIT_C_COMPILER "${CMAKE_C_COMPILER}")
-  if(CMAKE_OSX_SYSROOT)
-    set(LUAJIT_C_COMPILER "${LUAJIT_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
-  endif()
-
-  # Passing multiple `-arch` flags to the LuaJIT build will cause it to fail.
-  # To get a working universal build, we build each requested architecture slice
-  # individually then `lipo` them all up.
-  set(LUAJIT_SRC_DIR "${DEPS_BUILD_DIR}/src/luajit")
-  foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES)
-    set(STATIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH}")
-    set(DYNAMIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH} -fPIC")
-    set(TARGET_LD "${LUAJIT_C_COMPILER} -arch ${ARCH}")
-    list(APPEND LUAJIT_THIN_EXECUTABLES "${LUAJIT_SRC_DIR}-${ARCH}/src/luajit")
-    list(APPEND LUAJIT_THIN_STATIC_LIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.a")
-    list(APPEND LUAJIT_THIN_DYLIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.so")
-    list(APPEND LUAJIT_THIN_TARGETS "luajit-${ARCH}")
-
-    # See https://luajit.org/install.html#cross.
-    BuildLuaJit(TARGET "luajit-${ARCH}"
-        BUILD_COMMAND ${BUILDCMD_UNIX}
-        CC=${LUAJIT_C_COMPILER} STATIC_CC=${STATIC_CC}
-        DYNAMIC_CC=${DYNAMIC_CC} TARGET_LD=${TARGET_LD}
-        PREFIX=${DEPS_INSTALL_DIR}
-        ${DEPLOYMENT_TARGET})
-  endforeach()
-  BuildLuaJit(
-    CONFIGURE_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET}
-    COMMAND ${CMAKE_COMMAND} -E rm -f ${LUAJIT_SRC_DIR}/src/luajit ${LUAJIT_SRC_DIR}/src/libluajit.so ${LUAJIT_SRC_DIR}/src/libluajit.a
-    BUILD_COMMAND lipo ${LUAJIT_THIN_EXECUTABLES} -create -output ${LUAJIT_SRC_DIR}/src/luajit
-    COMMAND lipo ${LUAJIT_THIN_STATIC_LIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.a
-    COMMAND lipo ${LUAJIT_THIN_DYLIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.so
-    INSTALL_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET} install
-    DEPENDS ${LUAJIT_THIN_TARGETS}
-    )
-
 elseif(MINGW)
 
   if(CMAKE_GENERATOR MATCHES "Ninja")
diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake
index beadf028ee..2e07f9e337 100644
--- a/cmake.deps/cmake/BuildLuv.cmake
+++ b/cmake.deps/cmake/BuildLuv.cmake
@@ -31,7 +31,6 @@ ExternalProject_Add(luv
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv
   SOURCE_DIR ${DEPS_BUILD_DIR}/src/luv
   CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${LUV_CMAKE_ARGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
 
 if(USE_BUNDLED_LUAJIT)
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake
index 190a37bbc6..8f82dab140 100644
--- a/cmake.deps/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
@@ -4,5 +4,4 @@ ExternalProject_Add(msgpack
   CMAKE_ARGS ${DEPS_CMAKE_ARGS}
     -D MSGPACK_BUILD_TESTS=OFF
     -D MSGPACK_BUILD_EXAMPLES=OFF
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake
index 6757185425..7eb98163b9 100644
--- a/cmake.deps/cmake/BuildTreesitter.cmake
+++ b/cmake.deps/cmake/BuildTreesitter.cmake
@@ -5,5 +5,4 @@ ExternalProject_Add(treesitter
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt
     ${DEPS_BUILD_DIR}/src/treesitter/CMakeLists.txt
   CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})
diff --git a/cmake.deps/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake
index 892e5928a5..837d075d20 100644
--- a/cmake.deps/cmake/BuildTreesitterParsers.cmake
+++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake
@@ -25,7 +25,6 @@ function(BuildTSParser)
       ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt
     CMAKE_ARGS ${DEPS_CMAKE_ARGS}
       -D PARSERLANG=${TS_LANG}
-    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
     ${EXTERNALPROJECT_OPTIONS})
 endfunction()
 
diff --git a/cmake.deps/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake
index bb9c8f183b..7ce4b5fbf2 100644
--- a/cmake.deps/cmake/BuildUnibilium.cmake
+++ b/cmake.deps/cmake/BuildUnibilium.cmake
@@ -2,5 +2,4 @@ get_externalproject_options(unibilium ${DEPS_IGNORE_SHA})
 ExternalProject_Add(unibilium
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium
   CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
   ${EXTERNALPROJECT_OPTIONS})