Set NODE_PATH env var

kgryte · kgryte · commit ecba277f6d5d · 2018-01-18T21:14:49.000-08:00
diff --git a/tools/make/lib/lint/filenames.mk b/tools/make/lib/lint/filenames.mk
@@ -39,7 +39,7 @@ HEADER_FILENAME_LINTER_FLAGS ?=
 
 lint-filenames:
 	$(QUIET) $(MAKE_EXECUTABLE) $(FILENAME_LINTER)
-	$(QUIET) $(FILENAME_LINTER) $(FILENAME_LINTER_FLAGS) $(ROOT_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(FILENAME_LINTER) $(FILENAME_LINTER_FLAGS) $(ROOT_DIR)
 
 .PHONY: lint-filenames
 
@@ -50,6 +50,6 @@ lint-filenames:
 
 lint-header-filenames:
 	$(QUIET) $(MAKE_EXECUTABLE) $(HEADER_FILENAME_LINTER)
-	$(QUIET) $(HEADER_FILENAME_LINTER) $(HEADER_FILENAME_LINTER_FLAGS) $(ROOT_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(HEADER_FILENAME_LINTER) $(HEADER_FILENAME_LINTER_FLAGS) $(ROOT_DIR)
 
 .PHONY: lint-header-filenames
diff --git a/tools/make/lib/lint/license_headers.mk b/tools/make/lib/lint/license_headers.mk
@@ -55,7 +55,7 @@ lint-license-headers-files: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
 	$(QUIET) for file in $(FILES); do \
 		echo ""; \
 		echo "Linting: $$file"; \
-		NODE_PATH=$(NODE_PATH) $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS) $$file || exit 1; \
+		NODE_PATH="$(NODE_PATH)" $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS) $$file || exit 1; \
 	done
 
 .PHONY: lint-license-headers-files
@@ -88,7 +88,7 @@ lint-license-headers-javascript: lint-license-headers-javascript-src lint-licens
 # make lint-license-headers-javascript-src SOURCES_FILTER=.*/utils/group-by/.*
 #/
 lint-license-headers-javascript-src: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
-	$(QUIET) NODE_PATH=$(NODE_PATH) $(FIND_SOURCES_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(FIND_SOURCES_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
 
 .PHONY: lint-license-headers-javascript-src
 
@@ -104,7 +104,7 @@ lint-license-headers-javascript-src: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
 # make lint-license-headers-javascript-tests TESTS_FILTER=.*/utils/group-by/.*
 #/
 lint-license-headers-javascript-tests: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
-	$(QUIET) NODE_PATH=$(NODE_PATH) $(FIND_TESTS_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(FIND_TESTS_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
 
 .PHONY: lint-license-headers-javascript-tests
 
@@ -120,7 +120,7 @@ lint-license-headers-javascript-tests: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
 # make lint-license-headers-javascript-examples EXAMPLES_FILTER=.*/utils/group-by/.*
 #/
 lint-license-headers-javascript-examples: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
-	$(QUIET) NODE_PATH=$(NODE_PATH) $(FIND_EXAMPLES_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(FIND_EXAMPLES_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
 
 .PHONY: lint-license-headers-javascript-examples
 
@@ -136,6 +136,6 @@ lint-license-headers-javascript-examples: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
 # make lint-license-headers-javascript-benchmarks BENCHMARKS_FILTER=.*/utils/group-by/.*
 #/
 lint-license-headers-javascript-benchmarks: $(LICENSE_HEADER_LINT) $(NODE_MODULES)
-	$(QUIET) NODE_PATH=$(NODE_PATH) $(FIND_BENCHMARKS_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(FIND_BENCHMARKS_CMD) | $(NODE) $(LICENSE_HEADER_LINT) $(LICENSE_HEADER_LINT_FLAGS)
 
 .PHONY: lint-license-headers-javascript-benchmarks
diff --git a/tools/make/lib/lint/package_json.mk b/tools/make/lib/lint/package_json.mk
@@ -33,6 +33,6 @@ PACKAGE_JSON_LINTER_FLAGS ?=
 
 lint-pkg-json:
 	$(QUIET) $(MAKE_EXECUTABLE) $(PACKAGE_JSON_LINTER)
-	$(QUIET) $(PACKAGE_JSON_LINTER) $(PACKAGE_JSON_LINTER_FLAGS) $(ROOT_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(PACKAGE_JSON_LINTER) $(PACKAGE_JSON_LINTER_FLAGS) $(ROOT_DIR)
 
 .PHONY: lint-pkg-json
