aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordundargoc <gocdundar@gmail.com>2023-12-16 14:54:41 +0100
committerdundargoc <33953936+dundargoc@users.noreply.github.com>2023-12-16 16:47:22 +0100
commit896b400bff5ccc3d369bc19ab78bc4b5a8d88066 (patch)
treee9aa59f3c7955dccb15797912a974c4e67e85db2
parent69f5f0e20e81ef3b6cb5ea011eda024e6e277acf (diff)
downloadrneovim-896b400bff5ccc3d369bc19ab78bc4b5a8d88066.tar.gz
rneovim-896b400bff5ccc3d369bc19ab78bc4b5a8d88066.tar.bz2
rneovim-896b400bff5ccc3d369bc19ab78bc4b5a8d88066.zip
build: fix universal mac builds
Cmake 3.28+ will fail if two projects download the same file to prevent scheduling problems. This can be circumvented by downloading luajit to a unique location for each target. This is theoretically non-optimal since we need to download the same file three times for universal builds, but universal builds are rare and the convenience of this method outweighs setting up the dependencies optimally. This fixes the currently broken release workflow for mac. Closes https://github.com/neovim/neovim/issues/26526.
-rw-r--r--cmake.deps/cmake/BuildLuajit.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake.deps/cmake/BuildLuajit.cmake b/cmake.deps/cmake/BuildLuajit.cmake
index aa4c8e9293..243d8a4140 100644
--- a/cmake.deps/cmake/BuildLuajit.cmake
+++ b/cmake.deps/cmake/BuildLuajit.cmake
@@ -18,7 +18,7 @@ function(BuildLuajit)
ExternalProject_Add(${_luajit_TARGET}
URL ${LUAJIT_URL}
URL_HASH SHA256=${LUAJIT_SHA256}
- DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luajit
+ DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${_luajit_TARGET}
CONFIGURE_COMMAND "${_luajit_CONFIGURE_COMMAND}"
BUILD_IN_SOURCE 1
BUILD_COMMAND "${_luajit_BUILD_COMMAND}"