Skip to content
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

Add human readable message to point user to README #561

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add human readable message to point user to README #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,19 @@ fi
test -n "$want_help" && exit 0

my_dir=$(dirname "$0")
build_script=$my_dir/tools/build/src/engine/build.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
build_script=$my_dir/tools/build/src/engine/build.sh
build_script="$my_dir/tools/build/src/engine/build.sh"


if [ ! -f "$build_script" ]; then
echo "
Build script ($build_script) missing, please check install instructions:
./README
"
exit 1;
fi

# Determine the toolset, if not already decided
if test "x$TOOLSET" = x; then
guessed_toolset=`CXX= CXXFLAGS= $my_dir/tools/build/src/engine/build.sh --guess-toolset`
guessed_toolset=`CXX= CXXFLAGS= $build_script --guess-toolset`
case $guessed_toolset in
acc | clang | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
TOOLSET=$guessed_toolset
Expand Down Expand Up @@ -226,7 +235,7 @@ rm -f config.log
if test "x$BJAM" = x; then
$ECHO "Building B2 engine.."
pwd=`pwd`
CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET}
CXX= CXXFLAGS= "$build_script" ${TOOLSET}
if [ $? -ne 0 ]; then
echo
echo "Failed to build B2 build engine"
Expand Down