summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2017-06-15 13:53:42 -0700
committerRich Trott <rtrott@gmail.com>2017-06-17 12:56:50 -0700
commit22436b055da59bd416f343595fda92ca82bd2817 (patch)
tree14ed0e95ab148d45da493f77e18ce0ae4f97df53 /Makefile
parentecf6a46d98a5d73fb9f98f10a634c786b60aea09 (diff)
downloadnode-new-22436b055da59bd416f343595fda92ca82bd2817.tar.gz
build: check for linter in bin rather than lib
Make the "can we lint?" check in Makefile and vcbuild.bat depend on bin/eslint.js rather than lib/eslint.js. In ESLint 4.0.0, lib/eslint.js is not present. The lint rules call bin/eslint.js so check for that instead. PR-URL: https://github.com/nodejs/node/pull/13645 Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1aa317c88f..ae4925af0c 100644
--- a/Makefile
+++ b/Makefile
@@ -903,7 +903,7 @@ cpplint:
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
@$(PYTHON) tools/check-imports.py
-ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
+ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
lint:
@EXIT_STATUS=0 ; \
$(MAKE) jslint || EXIT_STATUS=$$? ; \