Set NODE_PATH env var

kgryte · kgryte · commit 08918a74af29 · 2018-01-18T21:21:51.000-08:00
diff --git a/tools/make/lib/ls/pkgs/addons.mk b/tools/make/lib/ls/pkgs/addons.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_ADDONS_FLAGS ?=
 # This target prints a list of all add-ons.
 
 list-pkgs-addons: $(LIST_PACKAGE_ADDONS) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_ADDONS) $(LIST_PACKAGE_ADDONS_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_ADDONS) $(LIST_PACKAGE_ADDONS_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-addons
diff --git a/tools/make/lib/ls/pkgs/browser_compatible.mk b/tools/make/lib/ls/pkgs/browser_compatible.mk
@@ -32,6 +32,6 @@ LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES_FLAGS ?=
 # This target prints a list of all packages which are compatible with browser environments.
 
 list-pkgs-browser-compatible: $(LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES) $(LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES) $(LIST_BROWSER_COMPATIBLE_PACKAGE_NAMES_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-browser-compatible
diff --git a/tools/make/lib/ls/pkgs/clis.mk b/tools/make/lib/ls/pkgs/clis.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_CLIS_FLAGS ?=
 # This target prints a list of all package command-line interfaces.
 
 list-pkgs-clis: $(LIST_PACKAGE_CLIS) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_CLIS) $(LIST_PACKAGE_CLIS_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_CLIS) $(LIST_PACKAGE_CLIS_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-clis
diff --git a/tools/make/lib/ls/pkgs/installed.mk b/tools/make/lib/ls/pkgs/installed.mk
@@ -32,7 +32,7 @@ LIST_INSTALLED_PACKAGES_FLAGS ?=
 # This target prints a list of all installed package dependencies.
 
 list-pkgs-installed: $(NODE_MODULES) $(LIST_INSTALLED_PACKAGES)
-	$(QUIET) $(NODE) $(LIST_INSTALLED_PACKAGES) $(LIST_INSTALLED_PACKAGES_FLAGS) $(ROOT_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_INSTALLED_PACKAGES) $(LIST_INSTALLED_PACKAGES_FLAGS) $(ROOT_DIR)
 
 .PHONY: list-pkgs-installed
 
diff --git a/tools/make/lib/ls/pkgs/names.mk b/tools/make/lib/ls/pkgs/names.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_NAMES_FLAGS ?=
 # This target prints a list of all package names.
 
 list-pkgs-names: $(LIST_PACKAGE_NAMES) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_NAMES) $(LIST_PACKAGE_NAMES_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_NAMES) $(LIST_PACKAGE_NAMES_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-names
diff --git a/tools/make/lib/ls/pkgs/namespaces.mk b/tools/make/lib/ls/pkgs/namespaces.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_NAMESPACES_FLAGS ?=
 # This target prints a list of all package namespaces.
 
 list-pkgs-namespaces: $(LIST_PACKAGE_NAMESPACES) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_NAMESPACES) $(LIST_PACKAGE_NAMESPACES_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_NAMESPACES) $(LIST_PACKAGE_NAMESPACES_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-namespaces
diff --git a/tools/make/lib/ls/pkgs/readmes.mk b/tools/make/lib/ls/pkgs/readmes.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_READMES_FLAGS ?=
 # This target prints a list of all package READMEs.
 
 list-pkgs-readmes: $(LIST_PACKAGE_READMES) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_READMES) $(LIST_PACKAGE_READMES_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_READMES) $(LIST_PACKAGE_READMES_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-readmes
diff --git a/tools/make/lib/ls/pkgs/tree.mk b/tools/make/lib/ls/pkgs/tree.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_TREE_FLAGS ?=
 # This target prints a list of all packages as a tree.
 
 list-pkgs-tree: $(LIST_PACKAGE_TREE) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_TREE) $(LIST_PACKAGE_TREE_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_TREE) $(LIST_PACKAGE_TREE_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-tree
diff --git a/tools/make/lib/ls/pkgs/wasm.mk b/tools/make/lib/ls/pkgs/wasm.mk
@@ -32,6 +32,6 @@ LIST_PACKAGE_WASM_FLAGS ?=
 # This target prints a list of all packages containing WebAssembly.
 
 list-pkgs-wasm: $(LIST_PACKAGE_WASM) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(LIST_PACKAGE_WASM) $(LIST_PACKAGE_WASM_FLAGS) $(SRC_DIR)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(LIST_PACKAGE_WASM) $(LIST_PACKAGE_WASM_FLAGS) $(SRC_DIR)
 
 .PHONY: list-pkgs-wasm
diff --git a/tools/make/lib/markdown/asset_links.mk b/tools/make/lib/markdown/asset_links.mk
@@ -39,6 +39,6 @@ RAWGIT_URL_FLAGS ?= \
 # This target generates an asset link based on the current Git hash for inclusion in a project Markdown file.
 
 markdown-asset-link: $(NODE_MODULES)
-	$(QUIET) $(RAWGIT_URL) $(RAWGIT_URL_FLAGS) $(MARKDOWN_ASSET_PATH)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(RAWGIT_URL) $(RAWGIT_URL_FLAGS) $(MARKDOWN_ASSET_PATH)
 
 .PHONY: markdown-asset-link
diff --git a/tools/make/lib/repl/browser.mk b/tools/make/lib/repl/browser.mk
@@ -32,7 +32,7 @@ REPL_BROWSER_BUNDLE ?= $(DIST_DIR)/stdlib-repl.min.js
 # This target starts a browser REPL environment.
 
 repl-browser: $(NODE_MODULES) $(REPL_BROWSER_BUNDLE)
-	$(QUIET) $(CAT) $(REPL_BROWSER_BUNDLE) | DEBUG=* $(repl_tmp_http_server) \
+	$(QUIET) $(CAT) $(REPL_BROWSER_BUNDLE) | NODE_PATH="$(NODE_PATH)" DEBUG=* $(repl_tmp_http_server) \
 		--stdin javascript \
 		--open
 
diff --git a/tools/make/lib/repl/node.mk b/tools/make/lib/repl/node.mk
@@ -39,8 +39,8 @@ REPL_DIR ?= $(ROOT_DIR)
 
 repl-node: $(NODE_MODULES) $(STDLIB)
 	$(QUIET) cd $(REPL_DIR); \
-	NODE_ENV=$(NODE_ENV_REPL) \
-	NODE_PATH=$(NODE_PATH_REPL) \
+	NODE_ENV="$(NODE_ENV_REPL)" \
+	NODE_PATH="$(NODE_PATH_REPL)" \
 	$(NODE) $(STDLIB) $(REPL) -- $(REPL_FLAGS)
 
 .PHONY: repl-node
diff --git a/tools/make/lib/stats/lloc_javascript.mk b/tools/make/lib/stats/lloc_javascript.mk
@@ -41,7 +41,7 @@ stats-lloc-javascript: stats-lloc-javascript-src stats-lloc-javascript-tests sta
 # This target calculates logical lines of code (LLOC) for only JavaScript source files.
 
 stats-lloc-javascript-src: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_SOURCES_CMD) | $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
+	$(QUIET) $(FIND_SOURCES_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
 
 .PHONY: stats-lloc-javascript-src
 
@@ -51,7 +51,7 @@ stats-lloc-javascript-src: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
 # This target calculates logical lines of code (LLOC) for only JavaScript test files.
 
 stats-lloc-javascript-tests: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_TESTS_CMD) | $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
+	$(QUIET) $(FIND_TESTS_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
 
 .PHONY: stats-lloc-javascript-tests
 
@@ -61,7 +61,7 @@ stats-lloc-javascript-tests: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
 # This target calculates logical lines of code (LLOC) for only JavaScript example files.
 
 stats-lloc-javascript-examples: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_EXAMPLES_CMD) | $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
+	$(QUIET) $(FIND_EXAMPLES_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
 
 .PHONY: stats-lloc-javascript-examples
 
@@ -71,7 +71,7 @@ stats-lloc-javascript-examples: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
 # This target calculates logical lines of code (LLOC) for only JavaScript benchmark files.
 
 stats-lloc-javascript-benchmarks: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_BENCHMARKS_CMD) | $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
+	$(QUIET) $(FIND_BENCHMARKS_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS)
 
 .PHONY: stats-lloc-javascript-benchmarks
 
@@ -83,6 +83,6 @@ stats-lloc-javascript-benchmarks: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
 # TODO: address possibility of `$FILES` exceeding maximum allowed shell arguments
 
 stats-lloc-javascript-files: $(JAVASCRIPT_LLOC) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS) $(FILES)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_LLOC) $(JAVASCRIPT_LLOC_FLAGS) $(FILES)
 
 .PHONY: stats-lloc-javascript-files
diff --git a/tools/make/lib/stats/repl.mk b/tools/make/lib/stats/repl.mk
@@ -30,6 +30,6 @@ REPL_LANG_STATS ?= $(TOOLS_DIR)/scripts/repl_lang_stats
 
 stats-repl-lang: $(REPL_LANG_STATS)
 	$(QUIET) $(MAKE_EXECUTABLE) $(REPL_LANG_STATS)
-	$(QUIET) $(REPL_LANG_STATS)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(REPL_LANG_STATS)
 
 .PHONY: stats-repl-lang
diff --git a/tools/make/lib/stats/sloc_javascript.mk b/tools/make/lib/stats/sloc_javascript.mk
@@ -41,7 +41,7 @@ stats-sloc-javascript: stats-sloc-javascript-src stats-sloc-javascript-tests sta
 # This target calculates source lines of code (SLOC) for only JavaScript source files.
 
 stats-sloc-javascript-src: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_SOURCES_CMD) | $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
+	$(QUIET) $(FIND_SOURCES_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
 
 .PHONY: stats-sloc-javascript-src
 
@@ -51,7 +51,7 @@ stats-sloc-javascript-src: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
 # This target calculates source lines of code (SLOC) for only JavaScript test files.
 
 stats-sloc-javascript-tests: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_TESTS_CMD) | $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
+	$(QUIET) $(FIND_TESTS_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
 
 .PHONY: stats-sloc-javascript-tests
 
@@ -61,7 +61,7 @@ stats-sloc-javascript-tests: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
 # This target calculates source lines of code (SLOC) for only JavaScript example files.
 
 stats-sloc-javascript-examples: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_EXAMPLES_CMD) | $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
+	$(QUIET) $(FIND_EXAMPLES_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
 
 .PHONY: stats-sloc-javascript-examples
 
@@ -71,7 +71,7 @@ stats-sloc-javascript-examples: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
 # This target calculates source lines of code (SLOC) for only JavaScript benchmark files.
 
 stats-sloc-javascript-benchmarks: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
-	$(QUIET) $(FIND_BENCHMARKS_CMD) | $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
+	$(QUIET) $(FIND_BENCHMARKS_CMD) | NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS)
 
 .PHONY: stats-sloc-javascript-benchmarks
 
@@ -83,6 +83,6 @@ stats-sloc-javascript-benchmarks: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
 # TODO: address possibility of `$FILES` exceeding maximum allowed shell arguments
 
 stats-sloc-javascript-files: $(JAVASCRIPT_SLOC) $(NODE_MODULES)
-	$(QUIET) $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS) $(FILES)
+	$(QUIET) NODE_PATH="$(NODE_PATH)" $(NODE) $(JAVASCRIPT_SLOC) $(JAVASCRIPT_SLOC_FLAGS) $(FILES)
 
 .PHONY: stats-sloc-javascript-files
