On Tue, Apr 15, 2014 at 11:00 AM, Josh Triplett <josh@xxxxxxxxxxxxxxxx> wrote: > On Tue, Apr 15, 2014 at 10:22:49AM -0700, Cody P Schafer wrote: >> On systems like ubuntu 12.04, llvm-config is llvm 2.9, but >> llvm-config-3.0 and llvm-config-3.3 (for example) are versions 3.0 and >> 3.3 respectively. Allow overriding the name/path of the llvm-config >> script so people can use these versioned config scripts >> >> Signed-off-by: Cody P Schafer <cody@xxxxxxxxxxxxxxxxxx> > > Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> Applied with trivial modification to use simple expanded variable. Chris diff --git a/Makefile b/Makefile index bbdc088..f453ded 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && $(CC) -c -Wp,-MD,.gcc-test.d .gcc-test.c 2>/dev/null && \ echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c) HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes') -LLVM_CONFIG=llvm-config +LLVM_CONFIG:=llvm-config HAVE_LLVM:=$(shell $(LLVM_CONFIG) --version >/dev/null 2>&1 && echo 'yes') HAVE_LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version | grep "^[3-9].*" >/dev/nul -LLVM_VERSION=$(shell $(LLVM_CONFIG) --version) +LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version) GCC_BASE = $(shell $(CC) --print-file-name=) BASIC_CFLAGS = -DGCC_BASE=\"$(GCC_BASE)\" -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html