From d19ae37af128a9b50ce94722a6486d3e29d60810 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 27 Oct 2022 02:39:18 +0200 Subject: [PATCH 1/2] Panic if LLVM > 14. --- build_odin.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build_odin.sh b/build_odin.sh index f131e088d..5ecb7709a 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -44,6 +44,12 @@ config_darwin() { fi fi + MAX_LLVM_VERSION=("14.999.999") + if [ $(version $($LLVM_CONFIG --version)) -gt $(version $MAX_LLVM_VERSION) ]; then + echo "Tried to use " $(which $LLVM_CONFIG) "version" $($LLVM_CONFIG --version) + panic "Requirement: llvm-config must be base version smaller than 15" + fi + LDFLAGS="$LDFLAGS -liconv -ldl" CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" LDFLAGS="$LDFLAGS -lLLVM-C" @@ -97,6 +103,12 @@ config_linux() { panic "Requirement: llvm-config must be base version greater than 11" fi + MAX_LLVM_VERSION=("14.999.999") + if [ $(version $($LLVM_CONFIG --version)) -gt $(version $MAX_LLVM_VERSION) ]; then + echo "Tried to use " $(which $LLVM_CONFIG) "version" $($LLVM_CONFIG --version) + panic "Requirement: llvm-config must be base version smaller than 15" + fi + LDFLAGS="$LDFLAGS -ldl" CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs --libfiles) -Wl,-rpath=\$ORIGIN" From 85a263130d6161e1ceed1d8d82d4c96cd66e87cc Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 27 Oct 2022 02:55:38 +0200 Subject: [PATCH 2/2] Add LLVM > 14 check to main.cpp for Darwin. --- src/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index a1daa51d1..4c6eaf521 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,6 +53,9 @@ gb_global Timings global_timings = {0}; #if LLVM_VERSION_MAJOR < 11 #error LLVM Version 11+ is required => "brew install llvm@11" #endif + #if LLVM_VERSION_MAJOR > 14 + #error LLVM Version 11..=14 is required => "brew install llvm@14" + #endif #endif #include "query_data.cpp"