Skip to content

Commit

Permalink
CI: Use homebrew's own compiler on macOS build
Browse files Browse the repository at this point in the history
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 <cazfi74@gmail.com>
  • Loading branch information
cazfi committed May 22, 2022
1 parent 689ec65 commit d755057
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/ci-build.sh
Expand Up @@ -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"
Expand All @@ -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 \
Expand Down

0 comments on commit d755057

Please sign in to comment.