user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #36256 - rjgoldsborough:make-configure-detect-nodejs-36207, r=alexcrichton

Browse source 
adding a check to bootstrap script

and a check to the rust config script

refs #36207

first crack at making configure detect nodejs
This commit is contained in:
bors 2016-09-09 14:04:31 -07:00 • committed by GitHub
commit 1284081d33
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -633,6 +633,7 @@ valopt datadir "${CFG_PREFIX}/share" "install data"
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
valopt llvm-root "" "set LLVM root"
valopt python "" "set path to python"
valopt nodejs "" "set path to nodejs"
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
valopt android-cross-path "" "Android NDK standalone path (deprecated)"
@ -748,6 +749,9 @@ if [ $(echo $python_version | grep -c '^Python 2\.7') -ne 1 ]; then
err "Found $python_version, but Python 2.7 is required"
fi
# Checking for node, but not required
probe CFG_NODEJS nodejs node
# If we have no git directory then we are probably a tarball distribution
# and shouldn't attempt to load submodules
if [ ! -e ${CFG_SRC_DIR}.git ]