From e39c8d6dc8d55a4b8681d52d58305645ceefdf0d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 2 Dec 2016 08:43:03 -0600 Subject: [PATCH 1/2] configure: only req CMake if we're building LLVM CMake is only necessary if LLVM is going to be built and not in any other case. Signed-off-by: Doug Goldstein --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5311bf4b064eb..e49b081a3de4e 100755 --- a/configure +++ b/configure @@ -848,7 +848,10 @@ then fi # For building LLVM -probe_need CFG_CMAKE cmake +if [ -z "$CFG_LLVM_ROOT" ] +then + probe_need CFG_CMAKE cmake +fi # On MacOS X, invoking `javac` pops up a dialog if the JDK is not # installed. Since `javac` is only used if `antlr4` is available, From f83eb4009e3e5a52bcb2dddc9fa7764aa9c12841 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 2 Dec 2016 11:25:43 -0600 Subject: [PATCH 2/2] configure: quote variables These should probably be quoted. Signed-off-by: Doug Goldstein --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e49b081a3de4e..483471604cb2a 100755 --- a/configure +++ b/configure @@ -1474,7 +1474,7 @@ fi step_msg "configuring submodules" # Have to be in the top of src directory for this -if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ] && [ -z $CFG_ENABLE_RUSTBUILD ] +if [ -z "$CFG_DISABLE_MANAGE_SUBMODULES" ] && [ -z "$CFG_ENABLE_RUSTBUILD" ] then cd ${CFG_SRC_DIR} @@ -1550,7 +1550,7 @@ do then msg "not configuring LLVM, rustbuild in use" do_reconfigure=0 - elif [ -z $CFG_LLVM_ROOT ] + elif [ -z "$CFG_LLVM_ROOT" ] then LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm LLVM_INST_DIR=$LLVM_BUILD_DIR