aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author0dminnimda <0dminnimda@gmail.com>2024-11-02 00:53:13 +0300
committer0dminnimda <0dminnimda@gmail.com>2024-11-02 00:53:13 +0300
commitd06fcbfdd3adfc44c1a9e13ca758f7dc1f3b2459 (patch)
treec11cb241f6e0639670daef2c83355817c94e3268
parentd52e80502b55b25da38cda948ec042c9d7ccaf07 (diff)
Update version in more places
-rwxr-xr-xbuild_odin.sh3
-rw-r--r--src/main.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/build_odin.sh b/build_odin.sh
index a2846646f..9010d5977 100755
--- a/build_odin.sh
+++ b/build_odin.sh
@@ -25,7 +25,8 @@ error() {
# Brew advises people not to add llvm to their $PATH, so try and use brew to find it.
if [ -z "$LLVM_CONFIG" ] && [ -n "$(command -v brew)" ]; then
- if [ -n "$(command -v $(brew --prefix llvm@18)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@18)/bin/llvm-config"
+ if [ -n "$(command -v $(brew --prefix llvm@19)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@19)/bin/llvm-config"
+ elif [ -n "$(command -v $(brew --prefix llvm@18)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@18)/bin/llvm-config"
elif [ -n "$(command -v $(brew --prefix llvm@17)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@17)/bin/llvm-config"
elif [ -n "$(command -v $(brew --prefix llvm@14)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@14)/bin/llvm-config"
fi
diff --git a/src/main.cpp b/src/main.cpp
index 1574ac544..772d57619 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,8 +89,8 @@ gb_global Timings global_timings = {0};
#if defined(GB_SYSTEM_OSX)
#include <llvm/Config/llvm-config.h>
- #if LLVM_VERSION_MAJOR < 11 || (LLVM_VERSION_MAJOR > 14 && LLVM_VERSION_MAJOR < 17) || LLVM_VERSION_MAJOR > 18
- #error LLVM Version 11..=14 or =18 is required => "brew install llvm@14"
+ #if LLVM_VERSION_MAJOR < 11 || (LLVM_VERSION_MAJOR > 14 && LLVM_VERSION_MAJOR < 17) || LLVM_VERSION_MAJOR > 19
+ #error LLVM Version 11..=14 or 18..=19 is required => "brew install llvm@14"
#endif
#endif