From 080107e2db1a0e89c315aeb5ed7fd5b02d9c03de Mon Sep 17 00:00:00 2001 From: theraven Date: Mon, 17 Dec 2012 19:29:39 +0000 Subject: [PATCH] Correctly pass the LLVM version in to the LLVM passes as they are built. --- opts/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/opts/CMakeLists.txt b/opts/CMakeLists.txt index 5286139..3cd10ef 100644 --- a/opts/CMakeLists.txt +++ b/opts/CMakeLists.txt @@ -20,7 +20,7 @@ add_llvm_loadable_module( libGNUObjCRuntime TypeFeedback.cpp ) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros -DLLVM_MAJOR=3 -DLLVM_MINOR=2") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros") set(CMAKE_CXX "clang++") @@ -30,5 +30,12 @@ EXEC_PROGRAM(llvm-config EXEC_PROGRAM(llvm-config ARGS --obj-root OUTPUT_VARIABLE LLVM_OBJ) +EXEC_PROGRAM(llvm-config + ARGS --version + OUTPUT_VARIABLE LLVM_VER) + +string(REGEX REPLACE "([0-9]*).([0-9]*).*" "-DLLVM_MAJOR=\\1 -DLLVM_MINOR=\\2" LLVM_VERSION "${LLVM_VER}") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_VERSION}") include_directories( ${LLVM_INCLUDE_DIRS} "${LLVM_SRC}/include/" "${LLVM_OBJ}/include/")