From ef0a5247b37edeacbc0a274bdb17e90d7561e6f7 Mon Sep 17 00:00:00 2001 From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com> Date: Sun, 4 Aug 2024 09:07:47 -0500 Subject: [PATCH] [TWEAK] Set cxx c compiler flags as cmake vars --- CI/before_script.osx.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 2175de0cd4..d3e3698ab2 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -1,8 +1,5 @@ #!/bin/sh -e -export CXX=clang++ -export CC=clang - # Silence a git warning git config --global advice.detachedHead false @@ -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"