From e2bfa0ee7ad2a03a48b4bba36411e0412260fc9c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 14 May 2022 08:28:11 +0300 Subject: [PATCH 34/34] CI: Use homebrew's own compiler on macOS build External compiler is incompatible with other tools in homebrew. Thanks to Jim DeLaHunt for pointing that out See osdn #44559 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 1ccb85d822..7752a4e4ae 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -50,7 +50,7 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" +export PATH="/usr/local/opt/llvm/bin:/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@6)/include $CPPFLAGS" export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@6)/lib" export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" @@ -61,12 +61,12 @@ mkdir build cd build ../autogen.sh --no-configure-run ../configure \ + CC="clang" CXX="clang++" \ --enable-debug \ --enable-sys-lua --with-qtver=qt6 \ --enable-client=gtk3.22,sdl2,qt,gtk4 \ --enable-fcmp=gtk3,gtk4,qt,cli \ --enable-freeciv-manual \ - --disable-mapimg \ || (let config_exit_status=$? \ && echo "Config exit status: $config_exit_status" \ && cat config.log \ -- 2.35.1