Commit bba41bf
build: fix makefile script on windows
On Windows there is a program "find.exe" located in
C:\Windows\System32, which is usually in the PATH before
MSYS version of that program (required for running makefile).
The Windows version of the program uses different CLI syntax,
which results in errors like
"File not found - *node_modules*"
This commit specifies the full path to the program, which is also
properly handled by MSYS on Windows.
PR-URL: #33136
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>1 parent cf82adf commit bba41bf
2 files changed
Lines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,6 +17,7 @@ GNUMAKEFLAGS += --no-print-directory | |||
| 17 | 17 | GCOV ?= gcov | |
| 18 | 18 | PWD = $(CURDIR) | |
| 19 | 19 | BUILD_WITH ?= make | |
| 20 | + FIND ?= find | ||
| 20 | 21 | ||
| 21 | 22 | ifdef JOBS | |
| 22 | 23 | PARALLEL_ARGS = -j $(JOBS) | |
@@ -168,7 +169,7 @@ uninstall: ## Uninstalls node from $PREFIX (default=/usr/local). | |||
| 168 | 169 | clean: ## Remove build artifacts. | |
| 169 | 170 | $(RM) -r out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE) \ | |
| 170 | 171 | out/$(BUILDTYPE)/node.exp | |
| 171 | - @if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' -o -name '*.d' | xargs $(RM) -r; fi | ||
| 172 | + @if [ -d out ]; then $(FIND) out/ -name '*.o' -o -name '*.a' -o -name '*.d' | xargs $(RM) -r; fi | ||
| 172 | 173 | $(RM) -r node_modules | |
| 173 | 174 | @if [ -d deps/icu ]; then echo deleting deps/icu; $(RM) -r deps/icu; fi | |
| 174 | 175 | $(RM) test.tap | |
@@ -1200,7 +1201,7 @@ LINT_MD_NEWER = -newer tools/.mdlintstamp | |||
| 1200 | 1201 | endif | |
| 1201 | 1202 | ||
| 1202 | 1203 | LINT_MD_TARGETS = doc src lib benchmark test tools/doc tools/icu $(wildcard *.md) | |
| 1203 | - LINT_MD_FILES = $(shell find $(LINT_MD_TARGETS) -type f \ | ||
| 1204 | + LINT_MD_FILES = $(shell $(FIND) $(LINT_MD_TARGETS) -type f \ | ||
| 1204 | 1205 | ! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md' \ | |
| 1205 | 1206 | $(LINT_MD_NEWER)) | |
| 1206 | 1207 | run-lint-md = tools/lint-md.js -q -f --no-stdout $(LINT_MD_FILES) | |
@@ -1377,7 +1378,7 @@ CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+ | |||
| 1377 | 1378 | # Related CI job: node-test-linter | |
| 1378 | 1379 | lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs | |
| 1379 | 1380 | @if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \ | |
| 1380 | - && ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \ | ||
| 1381 | + && ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \ | ||
| 1381 | 1382 | exit 0 ; \ | |
| 1382 | 1383 | else \ | |
| 1383 | 1384 | echo "" >&2 ; \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1744,6 +1744,10 @@ def make_bin_override(): | |||
| 1744 | 1744 | if options.use_ninja: | |
| 1745 | 1745 | config['BUILD_WITH'] = 'ninja' | |
| 1746 | 1746 | ||
| 1747 | + # On Windows there is another find.exe in C:\Windows\System32 | ||
| 1748 | + if sys.platform == 'win32': | ||
| 1749 | + config['FIND'] = '/usr/bin/find' | ||
| 1750 | + | ||
| 1747 | 1751 | config_lines = ['='.join((k,v)) for k,v in config.items()] | |
| 1748 | 1752 | # Add a blank string to get a blank line at the end. | |
| 1749 | 1753 | config_lines += [''] | |
0 commit comments