From 0adcf46cdf3d85e78e761fdaaa9c3fa8a69df927 Mon Sep 17 00:00:00 2001
From: Jake Goldsborough <rjgoldsborough@gmail.com>
Date: Tue, 6 Sep 2016 18:31:00 -0700
Subject: detecting nodejs in configure

---
 src/bootstrap/bootstrap.py | 9 ---------
 src/bootstrap/config.rs    | 3 ---
 2 files changed, 12 deletions(-)

(limited to 'src/bootstrap')

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);
 
-- 
cgit 1.4.1-3-g733a5