Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-13 17:12:39 +01:00
Code Releases Wiki Activity

build: Fix ARM64 macOS build issues

Browse Source
This commit is contained in:
WerWolv 2025-02-08 11:27:40 +01:00
parent 1fa27b7f09
commit e0c2a39ce7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/macOS/arm64.Dockerfile vendored
View File

@ -6,7 +6,15 @@ ENV MACOSX_DEPLOYMENT_TARGET 13.0
# -- DOWNLOADING STUFF # -- DOWNLOADING STUFF
# Update vcpkg # Update vcpkg
RUN git -C /vcpkg pull RUN <<EOF
cp /vcpkg/triplets/community/arm-osx-mytriplet.cmake /tmp/arm-osx-mytriplet.cmake
git -C /vcpkg clean -ffdx
git -C /vcpkg checkout origin/master
git -C /vcpkg reset --hard
git -C /vcpkg pull
/vcpkg/bootstrap-vcpkg.sh
cp /tmp/arm-osx-mytriplet.cmake /vcpkg/triplets/community/arm-osx-mytriplet.cmake
EOF
## Install make ## Install make
RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make

2
dist/web/Dockerfile vendored
View File

@ -13,8 +13,8 @@ RUN <<EOF
set -xe set -xe
git clone https://github.com/microsoft/vcpkg /vcpkg git clone https://github.com/microsoft/vcpkg /vcpkg
/vcpkg/bootstrap-vcpkg.sh
git -C /vcpkg pull git -C /vcpkg pull
/vcpkg/bootstrap-vcpkg.sh
sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
EOF EOF