Commit d338d41
build: add crypto check to build targets
Currently when configured without-ssl the build will fail when trying
to run the tools/doc/node_modules, and .docbuildstamp make targets:
internal/util.js:97
throw new ERR_NO_CRYPTO();
^
Error [ERR_NO_CRYPTO]: Node.js is not compiled with OpenSSL crypto
support
at assertCrypto (internal/util.js:97:11)
at crypto.js:31:1
...
at Object.<anonymous>
(/node/deps/npm/node_modules/uuid/lib/rng.js:4:14)
at Module._compile (internal/modules/cjs/loader.js:689:30)
...
make[1]: *** [tools/doc/node_modules] Error 1
This commit adds crypto check to these targets to allow the build to
pass.
PR-URL: #22148
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>1 parent d12c9f5 commit d338d41
1 file changed
Lines changed: 11 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -320,10 +320,16 @@ ifeq ($(OSTYPE),aix) | |||
| 320 | 320 | DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp | |
| 321 | 321 | endif | |
| 322 | 322 | ||
| 323 | + node_use_openssl = $(shell $(call available-node,"-p" \ | ||
| 324 | + "process.versions.openssl != undefined")) | ||
| 323 | 325 | test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules | |
| 326 | + ifeq ($(node_use_openssl),true) | ||
| 324 | 327 | $(RM) -r test/addons/??_*/ | |
| 325 | 328 | [ -x $(NODE) ] && $(NODE) $< || node $< | |
| 326 | 329 | touch $@ | |
| 330 | + else | ||
| 331 | + @echo "Skipping .docbuildstamp (no crypto)" | ||
| 332 | + endif | ||
| 327 | 333 | ||
| 328 | 334 | ADDONS_BINDING_GYPS := \ | |
| 329 | 335 | $(filter-out test/addons/??_*/binding.gyp, \ | |
@@ -1062,15 +1068,17 @@ lint-md-build: tools/remark-cli/node_modules \ | |||
| 1062 | 1068 | ||
| 1063 | 1069 | .PHONY: tools/doc/node_modules | |
| 1064 | 1070 | tools/doc/node_modules: | |
| 1065 | - @cd tools/doc && $(call available-node,$(run-npm-install)) | ||
| 1071 | + ifeq ($(node_use_openssl),true) | ||
| 1072 | + cd tools/doc && $(call available-node,$(run-npm-install)) | ||
| 1073 | + else | ||
| 1074 | + @echo "Skipping tools/doc/node_modules (no crypto)" | ||
| 1075 | + endif | ||
| 1066 | 1076 | ||
| 1067 | 1077 | .PHONY: lint-md | |
| 1068 | 1078 | ifneq ("","$(wildcard tools/remark-cli/node_modules/)") | |
| 1069 | 1079 | ||
| 1070 | 1080 | LINT_MD_DOC_FILES = $(shell ls doc/*.md doc/**/*.md) | |
| 1071 | 1081 | run-lint-doc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_DOC_FILES) | |
| 1072 | - node_use_openssl = $(shell $(call available-node,"-p" \ | ||
| 1073 | - "process.versions.openssl != undefined")) | ||
| 1074 | 1082 | # Lint all changed markdown files under doc/ | |
| 1075 | 1083 | tools/.docmdlintstamp: $(LINT_MD_DOC_FILES) | |
| 1076 | 1084 | ifeq ($(node_use_openssl),true) | |
0 commit comments