refix make, adjust build for CI weirdness

2 files changed, 19 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index e77acea93..8de6ff06b 100644
--- a/Makefile
+++ b/Makefile
@@ -40,19 +40,15 @@ ifeq ($(OS), Darwin)
     LDFLAGS:=$(LDFLAGS) -lLLVM-C
 endif
 ifeq ($(OS), Linux)
-    LLVM_CONFIG=llvm-config
-
-	LLVM_VERSIONS = "13.%.%" "12.0.1" "11.1.0"
-
-    LLVM_VERSION_PATTERN_SEPERATOR = )|(
-    LLVM_VERSION_PATTERNS_ESCAPED_DOT = $(subst .,\.,$(LLVM_VERSIONS))
-    LLVM_VERSION_PATTERNS_REPLACE_PERCENT = $(subst %,.*,$(LLVM_VERSION_PATTERNS_ESCAPED_DOT))
-    LLVM_VERSION_PATTERN_REMOVE_ELEMENTS = $(subst " ",$(LLVM_VERSION_PATTERN_SEPERATOR),$(LLVM_VERSION_PATTERNS_REPLACE_PERCENT))
-    LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR = $(subst ",,$(LLVM_VERSION_PATTERN_REMOVE_ELEMENTS))
-    LLVM_VERSION_PATTERN = "^(($(LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR)))"
-
-    ifeq ($(shell $(LLVM_CONFIG) --version | grep -E $(LLVM_VERSION_PATTERN)),)
-		$(error "Requirement: llvm-config must be base version greater than 11")
+    LLVM_CONFIG=llvm-config-11
+    ifneq ($(shell which llvm-config-11 2>/dev/null),)
+        LLVM_CONFIG=llvm-config-11
+    else ifneq ($(shell which llvm-config-11-64 2>/dev/null),)
+        LLVM_CONFIG=llvm-config-11-64
+    else
+        ifeq ($(shell $(LLVM_CONFIG) --version | grep '^11\.'),)
+            $(error "Requirement: llvm-config must be version 11")
+        endif
     endif
 
     LDFLAGS:=$(LDFLAGS) -ldl
diff --git a/build_odin.sh b/build_odin.sh
index 911e8a2d5..c707f4e67 100755
--- a/build_odin.sh
+++ b/build_odin.sh
@@ -50,15 +50,19 @@ config_openbsd() {
 }
 
 config_linux() {
-	LLVM_CONFIG=llvm-config
+	if which llvm-config > /dev/null 2>&1; then
+		LLVM_CONFIG=llvm-config
+	elif which llvm-config-11 > /dev/null 2>&1; then
+		LLVM_CONFIG=llvm-config-11
+	elif which llvm-config-11-64 > /dev/null 2>&1; then
+		LLVM_CONFIG=llvm-config-11-64
+	else
+		panic "Unable to find LLVM-config"
+	fi
 
 	MIN_LLVM_VERSION=("11.1.0")
 	if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then
-
-		LLVM_CONFIG=llvm-config-11
-		if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then
-			panic "Requirement: llvm-config must be base version greater than 11"
-		fi
+		panic "Requirement: llvm-config must be base version greater than 11"
 	fi
 
 	LDFLAGS="$LDFLAGS -ldl"