OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #38128 - cardoe:req-cmake-only-for-llvm, r=alexcrichton

Browse Source 
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 <cardoe@cardoe.com>
This commit is contained in:
bors 2016-12-06 03:45:49 +00:00
commit f7c93c07b8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -848,7 +848,10 @@ then
fi fi
# For building LLVM # For building LLVM
if [ -z "$CFG_LLVM_ROOT" ]
then
probe_need CFG_CMAKE cmake probe_need CFG_CMAKE cmake
fi
# On MacOS X, invoking `javac` pops up a dialog if the JDK is not # On MacOS X, invoking `javac` pops up a dialog if the JDK is not
# installed. Since `javac` is only used if `antlr4` is available, # installed. Since `javac` is only used if `antlr4` is available,
@ -1471,7 +1474,7 @@ fi
step_msg "configuring submodules" step_msg "configuring submodules"
# Have to be in the top of src directory for this # 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 then
cd ${CFG_SRC_DIR} cd ${CFG_SRC_DIR}
@ -1547,7 +1550,7 @@ do
then then
msg "not configuring LLVM, rustbuild in use" msg "not configuring LLVM, rustbuild in use"
do_reconfigure=0 do_reconfigure=0
elif [ -z $CFG_LLVM_ROOT ] elif [ -z "$CFG_LLVM_ROOT" ]
then then
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
LLVM_INST_DIR=$LLVM_BUILD_DIR LLVM_INST_DIR=$LLVM_BUILD_DIR