nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 08:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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 infodir "${CFG_PREFIX}/share/info" "install additional info"
valopt llvm-root "" "set LLVM root" valopt llvm-root "" "set LLVM root"
valopt python "" "set path to python" valopt python "" "set path to python"
valopt nodejs "" "set path to nodejs"
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located" valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple" valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
valopt android-cross-path "" "Android NDK standalone path (deprecated)" 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" err "Found $python_version, but Python 2.7 is required"
fi 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 # If we have no git directory then we are probably a tarball distribution
# and shouldn't attempt to load submodules # and shouldn't attempt to load submodules
if [ ! -e ${CFG_SRC_DIR}.git ] if [ ! -e ${CFG_SRC_DIR}.git ]

4
src/bootstrap/config.rs
View File

@ -80,6 +80,7 @@ pub struct Config {
pub musl_root: Option<PathBuf>, pub musl_root: Option<PathBuf>,
pub prefix: Option<String>, pub prefix: Option<String>,
pub codegen_tests: bool, pub codegen_tests: bool,
pub nodejs: Option<PathBuf>,
} }
/// Per-target configuration stored in the global configuration structure. /// Per-target configuration stored in the global configuration structure.
@ -395,6 +396,9 @@ impl Config {
self.rustc = Some(PathBuf::from(value).join("bin/rustc")); self.rustc = Some(PathBuf::from(value).join("bin/rustc"));
self.cargo = Some(PathBuf::from(value).join("bin/cargo")); self.cargo = Some(PathBuf::from(value).join("bin/cargo"));
} }
"CFG_NODEJS" if value.len() > 0 => {
self.nodejs = Some(PathBuf::from(value));
}
_ => {} _ => {}
} }
} }

6
src/bootstrap/sanity.rs
View File

@ -75,6 +75,12 @@ pub fn check(build: &mut Build) {
need_cmd("python".as_ref()); need_cmd("python".as_ref());
// If a manual nodejs was added to the config,
// of if a nodejs install is detected through config, use it.
if let Some(ref s) = build.config.nodejs {
need_cmd(s.as_ref());
}
// We're gonna build some custom C code here and there, host triples // We're gonna build some custom C code here and there, host triples
// also build some C++ shims for LLVM so we need a C++ compiler. // also build some C++ shims for LLVM so we need a C++ compiler.
for target in build.config.target.iter() { for target in build.config.target.iter() {