diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-04-11 21:11:36 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <sotsu@yahoo-corp.jp> | 2018-04-12 11:19:04 +0900 |
| commit | f3f129898056244a52aed33b89d0edffc128637a (patch) | |
| tree | 20ffbc30ffa77149d6d6db2c1ed3a448cef638cb /BUILDING.md | |
| parent | df5d41bf93a304af4159398d0d9f44f0cba4ac94 (diff) | |
| download | android-node-v8-f3f129898056244a52aed33b89d0edffc128637a.tar.gz android-node-v8-f3f129898056244a52aed33b89d0edffc128637a.tar.bz2 android-node-v8-f3f129898056244a52aed33b89d0edffc128637a.zip | |
build, win: opt-in openssl_no_asm if no nasm found
Instead of automatically falling back to openssl_no_asm with warning
if no nasm is found during build on Windows, this stops vcbuild.bat
and requires users to specify openssl_no_asm option explicitly.
Fixes: https://github.com/nodejs/node/issues/19918
PR-URL: https://github.com/nodejs/node/pull/19943
Refs: https://github.com/nodejs/node/pull/19930
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Diffstat (limited to 'BUILDING.md')
| -rw-r--r-- | BUILDING.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BUILDING.md b/BUILDING.md index 4a93b37efa..da832c9c24 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -258,9 +258,9 @@ Prerequisites: * Basic Unix tools required for some tests, [Git for Windows](http://git-scm.com/download/win) includes Git Bash and tools which can be included in the global `PATH`. -* **Optional** (for OpenSSL assembler modules): the [NetWide Assembler](http://www.nasm.us/), - if not installed in the default location it needs to be manually added - to `PATH`. +* The [NetWide Assembler](http://www.nasm.us/), for OpenSSL assembler modules. + If not installed in the default location, it needs to be manually added + to `PATH`. Build with `openssl-no-asm` option does not require this. * **Optional** (to build the MSI): the [WiX Toolset v3.11](http://wixtoolset.org/releases/) and the [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension). |