diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-05-30 17:26:48 +0000 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-09-19 10:52:21 -0400 |
| commit | 273e02d89abb81269f3f65a49d570c9395746e5b (patch) | |
| tree | f077f32fbee2918fd13ecad1402b9d1d0626b1cf | |
| parent | 84a838e2090f68620393be32cb2b3aa755602fa4 (diff) | |
| download | node-new-273e02d89abb81269f3f65a49d570c9395746e5b.tar.gz | |
doc: add missing make command to UPGRADING.md
Added the missing make command in steps 6.3 when building
asm_obsolete.
Also updated the commit message to include the version nasm in
addition to the gcc version.
Fixes: https://github.com/nodejs/node/issues/13161
Backport-PR-URL: https://github.com/nodejs/node/pull/13696
PR-URL: https://github.com/nodejs/node/pull/13233
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
| -rw-r--r-- | deps/openssl/doc/UPGRADING.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/deps/openssl/doc/UPGRADING.md b/deps/openssl/doc/UPGRADING.md index 106701864c..fc229f1975 100644 --- a/deps/openssl/doc/UPGRADING.md +++ b/deps/openssl/doc/UPGRADING.md @@ -346,6 +346,7 @@ ohtsu@ubuntu:~/github/node/deps/openssl/asm_obsolete$ make clean find . -iname '*.asm' -exec rm "{}" \; find . -iname '*.s' -exec rm "{}" \; find . -iname '*.S' -exec rm "{}" \; +ohtsu@ubuntu:~/github/node/deps/openssl/asm_obsolete$ make ohtsu@ubuntu:~/github/node/deps/openssl$ git status ohtsu@ubuntu:~/github/node/deps/openssl$ git commit asm asm_obsolete ```` @@ -353,6 +354,8 @@ The commit message can be >deps: update openssl asm and asm_obsolete files > ->Regenerate asm files with Makefile and CC=gcc and ASM=gcc where ->gcc-4.8.4. Also asm files in asm_obsolete dir to support old compiler ->and assembler are regenerated without CC and ASM envs. +>Regenerate asm files with Makefile and CC=gcc and ASM=nasm where gcc +>version was 5.4.0 and nasm version was 2.11.08. +> +>Also asm files in asm_obsolete dir to support old compiler and +>assembler are regenerated without CC and ASM envs. |