Autodetect llvm-config-6.0 / llvm-config60 (#6381)

crystal-lang · Jul 13, 2018 · 72eedae · 72eedae
1 parent 6a30458
commit 72eedae
Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -33,6 +33,8 @@ EXPORTS := $(if $(release),,CRYSTAL_CONFIG_PATH="$(PWD)/src")
 SHELL = sh
 LLVM_CONFIG_FINDER := \
   [ -n "$(LLVM_CONFIG)" ] && command -v "$(LLVM_CONFIG)" || \
+  command -v llvm-config-6.0 || command -v llvm-config60 || \
+    (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 6.0*) command -v llvm-config;; *) false;; esac)) || \
   command -v llvm-config-5.0 || command -v llvm-config50 || \
     (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 5.0*) command -v llvm-config;; *) false;; esac)) || \
   command -v llvm-config-4.0 || command -v llvm-config40 || \

diff --git a/src/llvm/lib_llvm.cr b/src/llvm/lib_llvm.cr
@@ -2,6 +2,8 @@
 lib LibLLVM
   LLVM_CONFIG = {{
                   `[ -n "$LLVM_CONFIG" ] && command -v "$LLVM_CONFIG" || \
+                   command -v llvm-config-6.0 || command -v llvm-config60 || \
+                   (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 6.0*) command -v llvm-config;; *) false;; esac)) || \
                    command -v llvm-config-5.0 || command -v llvm-config50 || \
                    (command -v llvm-config > /dev/null && (case "$(llvm-config --version)" in 5.0*) command -v llvm-config;; *) false;; esac)) || \
                    command -v llvm-config-4.0 || command -v llvm-config40 || \