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

adding a check to bootstrap script

Browse source 
and a check to the rust config script
This commit is contained in:
Jake Goldsborough 2016-09-03 20:22:12 -07:00
parent 70598e04f9
commit b66410043a
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/bootstrap.py
View file

@ -236,6 +236,15 @@ class RustBuild:
return config + '/bin/rustc' + self.exe_suffix()
return os.path.join(self.bin_root(), "bin/rustc" + self.exe_suffix())
def nodejs(self):
config = self.get_toml('nodejs')
if config:
return config
if os.path.exists(os.path.join(self.bin_root(), "bin/nodejs")):
return os.path.join(self.bin_root(), "bin/nodejs" + self.exe_suffix())
elif os.path.exists(os.path.join(self.bin_root(), "bin/node")):
return os.path.join(self.bin_root(), "bin/node" + self.exe_suffix())
def get_string(self, line):
start = line.find('"')
end = start + 1 + line[start+1:].find('"')

3
src/bootstrap/config.rs
View file

@ -67,6 +67,7 @@ pub struct Config {
pub target: Vec<String>,
pub rustc: Option<PathBuf>,
pub cargo: Option<PathBuf>,
pub nodejs: Option<PathBuf>,
pub local_rebuild: bool,
// libstd features
@ -111,6 +112,7 @@ struct Build {
host: Vec<String>,
target: Vec<String>,
cargo: Option<String>,
nodejs: Option<String>,
rustc: Option<String>,
compiler_docs: Option<bool>,
docs: Option<bool>,
@ -215,6 +217,7 @@ impl Config {
}
config.rustc = build.rustc.map(PathBuf::from);
config.cargo = build.cargo.map(PathBuf::from);
config.nodejs = build.nodejs.map(PathBuf::from);
set(&mut config.compiler_docs, build.compiler_docs);
set(&mut config.docs, build.docs);