Skip to content

Commit

Permalink
Merge branch 'mac-build-compiler-flags' into 'master'
Browse files Browse the repository at this point in the history
[TWEAK] Set cxx c compiler flags as cmake vars in mac build script

See merge request OpenMW/openmw!4300
  • Loading branch information
psi29a committed Aug 5, 2024
2 parents d2d7d77 + ef0a524 commit 27ea613
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions CI/before_script.osx.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#!/bin/sh -e

export CXX=clang++
export CC=clang

# Silence a git warning
git config --global advice.detachedHead false

Expand All @@ -21,6 +18,8 @@ declare -a CMAKE_CONF_OPTS=(
-D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
-D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
-D CMAKE_CXX_FLAGS="-stdlib=libc++"
-D CMAKE_C_COMPILER="clang"
-D CMAKE_CXX_COMPILER="clang++"
-D CMAKE_OSX_DEPLOYMENT_TARGET="13.6"
-D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE
-D Boost_INCLUDE_DIR="$DEPENDENCIES_ROOT/include"
Expand Down

0 comments on commit 27ea613

Please sign in to comment.