From b675c87f2e6113bd3e5d6e721a5405d3070e1afe Mon Sep 17 00:00:00 2001 From: div72 Date: Sat, 7 Sep 2024 19:20:14 +0300 Subject: [PATCH] ci: add clang for darwin cross job Needed now since FORCE_USE_SYSTEM_CLANG is removed and system clang is mandatory. --- ci/test/00_setup_env_mac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index d1c3558ba6..2113d40d19 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -7,9 +7,9 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross -export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos +export DOCKER_NAME_TAG=ubuntu:24.04 export HOST=x86_64-apple-darwin -export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso" +export PACKAGES="clang lld llvm cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso" export XCODE_VERSION=15.0 export XCODE_BUILD_ID=15A240d export RUN_UNIT_TESTS=false