Merge pull request #13241 from JuliaLang/yyc/sys-llvm-ver

set LLVM_VER from LLVM_CONFIG when using system LLVM
JuliaLang · Sep 21, 2015 · 47ed2ec · 47ed2ec
2 parents 7d022e8 + cc12b63
commit 47ed2ec
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Make.inc b/Make.inc
@@ -634,10 +634,6 @@ endif
 endif
 endif
 
-ifeq ($(USE_SYSTEM_LLVM), 1)
-JCPPFLAGS+=-DSYSTEM_LLVM
-endif
-
 ifeq ($(origin LLVM_CONFIG), undefined)
 ifeq ($(USE_SYSTEM_LLVM), 1)
 LLVM_CONFIG := llvm-config$(EXE)
@@ -646,6 +642,11 @@ LLVM_CONFIG := $(build_bindir)/llvm-config$(EXE)
 endif
 endif # LLVM_CONFIG undefined
 
+ifeq ($(USE_SYSTEM_LLVM), 1)
+JCPPFLAGS+=-DSYSTEM_LLVM
+LLVM_VER := $(shell $(LLVM_CONFIG) --version)
+endif # SYSTEM_LLVM
+
 ifeq ($(BUILD_OS),$(OS))
 LLVM_CONFIG_HOST := $(LLVM_CONFIG)
 else
@@ -657,7 +658,7 @@ ifeq ($(shell $(LLVM_CONFIG_HOST) --version),3.3)
 LLVM_CONFIG_HOST = $(call spawn,$(LLVM_CONFIG))
 endif
 endif
-endif # SYSTEM_LLVM
+endif
 
 ifeq ($(USE_SYSTEM_PCRE), 1)
 PCRE_CONFIG := pcre2-config