Skip to content

configure: only req CMake if we're building LLVM #38128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2016
Merged

configure: only req CMake if we're building LLVM #38128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39c8d6
configure: only req CMake if we're building LLVM
cardoe Dec 2, 2016
f83eb40
configure: quote variables
cardoe Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -1471,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}

Expand Down Expand Up @@ -1547,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
Expand Down