From ea72398adf925fe57d100a51b6b6353ba7835e57 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Feb 2014 18:07:08 -0800 Subject: [PATCH 1/2] configure: Accept LLVM 3.5 for building rust This is the current head of LLVM, and we can indeed build with 3.5 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 75514ada973b4..a25eb8321146a 100755 --- a/configure +++ b/configure @@ -604,7 +604,7 @@ then LLVM_VERSION=$($LLVM_CONFIG --version) case $LLVM_VERSION in - (3.[2-4]svn|3.[2-4]) + (3.[2-5]svn|3.[2-5]) msg "found ok version of LLVM: $LLVM_VERSION" ;; (*) @@ -626,7 +626,7 @@ then | cut -d ' ' -f 2) case $CFG_CLANG_VERSION in - (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* ) + (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* | 3.5* ) step_msg "found ok version of CLANG: $CFG_CLANG_VERSION" CFG_C_COMPILER="clang" ;; From 6d79ed191518d0301cf0dcd98a1892526e11d1c1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Feb 2014 18:07:33 -0800 Subject: [PATCH 2/2] mk: Fix --llvm-root finding tools LLVM's tools are not contained in the local directory if --llvm-root is used by the ./configure script. This fixes the installation path to be the root provided by --llvm-root. --- mk/main.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mk/main.mk b/mk/main.mk index 2c7c7c7cecd6d..af434ee32df98 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -218,8 +218,12 @@ LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt llvm-extract define DEF_LLVM_VARS # The configure script defines these variables with the target triples # separated by Z. This defines new ones with the expected format. +ifeq ($$(CFG_LLVM_ROOT),) CFG_LLVM_BUILD_DIR_$(1):=$$(CFG_LLVM_BUILD_DIR_$(subst -,_,$(1))) CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_INST_DIR_$(subst -,_,$(1))) +else +CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_ROOT) +endif # Any rules that depend on LLVM should depend on LLVM_CONFIG LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X_$(1))