summaryrefslogtreecommitdiff
path: root/deps/npm/lib/rebuild.js
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-03-02 09:31:24 -0800
committerisaacs <i@izs.me>2012-03-02 09:31:46 -0800
commit054127112ce335ceb4477a481e99e3fb2176b457 (patch)
tree22c5386ce5538f3db7996a6e71d30264617a66b8 /deps/npm/lib/rebuild.js
parentedea94c332f07ed81ea7de9b93bbcec806c81544 (diff)
downloadnode-new-054127112ce335ceb4477a481e99e3fb2176b457.tar.gz
Upgrade npm to 1.1.3
* Update request to support HTTPS-over-HTTP proxy tunneling * Throw on undefined envs in config settings * Update which to 1.0.5 * Fix windows UNC busyloop in findPrefix * Bundle nested bundleDependencies properly * Alias adduser to add-user * Doc updates (Christian Howe, Henrik Hodne, Andrew Lunny) * ignore logfd/outfd streams in makeEnv() (Rod Vagg) * shrinkwrap: Behave properly with url-installed deps * install: Support --save with url install targets * Support installing naked tars or single-file modules from urls etc. * init: Don't add engines section * Don't run make clean on rebuild * Added missing unicode replacement (atomizer)
Diffstat (limited to 'deps/npm/lib/rebuild.js')
-rw-r--r--deps/npm/lib/rebuild.js3
1 files changed, 0 insertions, 3 deletions
diff --git a/deps/npm/lib/rebuild.js b/deps/npm/lib/rebuild.js
index fc5f96825d..0e1d56a1de 100644
--- a/deps/npm/lib/rebuild.js
+++ b/deps/npm/lib/rebuild.js
@@ -31,7 +31,6 @@ function rebuild (args, cb) {
function cleanBuild (folders, set, cb) {
// https://github.com/isaacs/npm/issues/1872
- // If there's a makefile, try 'make clean'
// If there's a wscript, try 'node-waf clean'
// But don't die on either of those if they fail.
// Just a best-effort kind of deal.
@@ -41,8 +40,6 @@ function cleanBuild (folders, set, cb) {
if (er) return cb(er)
if (files.indexOf("wscript") !== -1) {
exec("node-waf", ["clean"], null, false, f, thenBuild)
- } else if (files.indexOf("Makefile") !== -1) {
- exec("make", ["clean"], null, false, f, thenBuild)
} else thenBuild()
})
function thenBuild (er) {