1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-26 21:55:21 +03:00

fix universal build

This commit is contained in:
George Harker 2023-11-05 07:00:03 -08:00
parent dff22ec24d
commit f93ef45af5
3 changed files with 6 additions and 4 deletions

View File

@ -9,8 +9,8 @@ build_libnvim() {
# Brew's gettext does not get sym-linked to PATH
export PATH="/opt/homebrew/opt/gettext/bin:/usr/local/opt/gettext/bin:${PATH}"
#macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64"
macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
#macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64"
pushd ../Neovim
@ -20,6 +20,7 @@ build_libnvim() {
SDKROOT="$(xcrun --show-sdk-path)" \
MACOSX_DEPLOYMENT_TARGET="${deployment_target}" \
CMAKE_EXTRA_FLAGS="" \
CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
DEPS_CMAKE_FLAGS="${macos_flags}" \
libnvim nvim

View File

@ -17,8 +17,8 @@ main() {
./NvimServer/bin/build_libnvim.sh
fi
#swift build --arch arm64 --arch x86_64 -c release --product NvimServer
swift build --arch arm64 -c release --product NvimServer
swift build --arch arm64 --arch x86_64 -c release --product NvimServer
#swift build --arch arm64 -c release --product NvimServer
popd >/dev/null
echo "### Built NvimServer"

View File

@ -20,6 +20,7 @@ main() {
pushd ./NvimServer/third-party >/dev/null
brew fetch --bottle-tag="${arm64_bottle}" gettext
brew fetch --bottle-tag="${x86_64_bottle}" gettext
brew fetch --bottle-tag="${arm64_bottle}" lua
brew fetch --bottle-tag="${x86_64_bottle}" lua
local version; version=$(brew info gettext --json | jq -r ".[0].versions.stable"); readonly version