diff --git a/data/macos/build.sh b/data/macos/build.sh
index c100e60ac..5c5a82791 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -20,7 +20,10 @@ source data/macos/common.env
 MAKE_ARGS="${MAKE_ARGS} EXTERNAL_PLUGINS=false"
 
 export MACOS="true"
-export MACOS_OLD="true"
+
+if [ $(clang -v  2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p') -lt 9 ]; then
+  export MACOS_OLD="true"
+fi
 
 export CC=clang
 export CXX=clang++
diff --git a/data/macos/env.sh b/data/macos/env.sh
index 1e4ffd026..07b7f3c48 100644
--- a/data/macos/env.sh
+++ b/data/macos/env.sh
@@ -5,13 +5,14 @@
 
 source data/macos/common.env
 
-export MACOS="true"
-export MACOS_OLD="true"
 export CC=clang
 export CXX=clang++
 
 export MACOS="true"
-export MACOS_OLD="true"
+
+if [ $(clang -v  2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p') -lt 9 ]; then
+  export MACOS_OLD="true"
+fi
 
 export CC=clang
 export CXX=clang++