---

rillian · graydon · commit 81f2d99a20bd · 2010-10-21T16:06:39.000-07:00
yaml --- r: 827 b: refs/heads/master c: 6b9a9a7 h: refs/heads/master i: 825: c3afcab 823: 6f66da4 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3879c19c2d5141d9f554687552c234b64b029c7
+refs/heads/master: 6b9a9a787435f934c6d616f9720dabce24416a76
diff --git a/trunk/src/Makefile b/trunk/src/Makefile
@@ -168,14 +168,13 @@ endif
 ifneq ($(CFG_LLVM_CONFIG),)
   CFG_LLVM_VERSION := $(shell $(CFG_LLVM_CONFIG) --version)
   $(info cfg: found llvm-config at $(CFG_LLVM_CONFIG))
-  ifneq ($(findstring 2.8,$(CFG_LLVM_VERSION)),)
-    $(info cfg: using LLVM version $(CFG_LLVM_VERSION))
-  else ifneq ($(findstring 2.9,$(CFG_LLVM_VERSION)),)
+  CFG_LLVM_ALLOWED_VERSIONS := 2.8svn 2.8 2.9svn
+  ifneq ($(findstring $(CFG_LLVM_VERSION),$(CFG_LLVM_ALLOWED_VERSIONS)),)
     $(info cfg: using LLVM version $(CFG_LLVM_VERSION))
   else
     CFG_LLVM_CONFIG :=
     $(info cfg: incompatible LLVM version $(CFG_LLVM_VERSION), \
-      expected 2.8)
+      expected one of $(CFG_LLVM_ALLOWED_VERSIONS)
   endif
 endif
 ifneq ($(CFG_LLVM_CONFIG),)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: c3879c19c2d5141d9f554687552c234b64b029c7`
	`2`	`+refs/heads/master: 6b9a9a787435f934c6d616f9720dabce24416a76`