diff options
| author | Jake Goldsborough <rjgoldsborough@gmail.com> | 2016-09-06 18:31:00 -0700 |
|---|---|---|
| committer | Jake Goldsborough <rjgoldsborough@gmail.com> | 2016-09-06 18:31:00 -0700 |
| commit | 0adcf46cdf3d85e78e761fdaaa9c3fa8a69df927 (patch) | |
| tree | e97509b87ef1d6982ae183b68b34d1497912c909 /src/bootstrap | |
| parent | 79644ac3c4fe1b27dc64e0b172d3fca80a88335c (diff) | |
| download | rust-0adcf46cdf3d85e78e761fdaaa9c3fa8a69df927.tar.gz rust-0adcf46cdf3d85e78e761fdaaa9c3fa8a69df927.zip | |
detecting nodejs in configure
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 9 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 3f4a18ab124..17a7c9ca66a 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -236,15 +236,6 @@ 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('"') diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 5a7ae4f6973..682a6f74126 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -67,7 +67,6 @@ 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 @@ -112,7 +111,6 @@ struct Build { host: Vec<String>, target: Vec<String>, cargo: Option<String>, - nodejs: Option<String>, rustc: Option<String>, compiler_docs: Option<bool>, docs: Option<bool>, @@ -217,7 +215,6 @@ 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); |
