From 9aea990184b35dadbd786b70730111735fb4fc0a Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:49:52 -0800 Subject: [PATCH] clean up osx semver handling in build --- build_odin.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build_odin.sh b/build_odin.sh index 8cd0849a7..80c35dc44 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -14,19 +14,21 @@ panic() { exit 1 } +function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } + config_darwin() { ARCH=$(uname -m) LLVM_CONFIG=llvm-config # allow for arm only llvm's with version 13 if [ ARCH == arm64 ]; then - LLVM_VERSIONS="13.%.%" + MIN_LLVM_VERSION=("13.0.0") else # allow for x86 / amd64 all llvm versions begining from 11 - LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" + MIN_LLVM_VERSION=("11.1.0") fi - if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then + if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then if [ ARCH == arm64 ]; then panic "Requirement: llvm-config must be base version 13 for arm64" else