From 8b7aa00a371bced7efc4cef0cf898bb2886c527c Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 7 Nov 2018 22:43:45 -0800 Subject: [PATCH 1/4] doc: edit BUILDING.md Minor edits to BUILDING.md to keep sentences short and clear. --- BUILDING.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 462e7b4a0104b6..be2a85d8e2b083 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -70,8 +70,7 @@ There are three support tiers: ### Supported platforms The community does not build or test against end-of-life distributions (EoL). -Thus, we do not recommend that you use Node.js on end-of-life or unsupported -platforms in production. +For production applications, run Node.js on supported platforms only. | System | Support type | Version | Architectures | Notes | | ------------ | ------------ | ------------------------------- | ---------------- | ----------------------------- | @@ -139,17 +138,16 @@ support on x86_64 and ia32. * llvm version 3.3 or higher * nasm version 2.10 or higher in Windows -Otherwise `configure` will fail with an error. This can be avoided by -either providing a newer assembler as per the list above or by -using the `--openssl-no-asm` flag. +Otherwise `configure` will fail with an error. Avoid this by either providing a +newer assembler as per the list above or by using the `--openssl-no-asm` flag. The forthcoming OpenSSL-1.1.1 will have different requirements. Please refer to https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html for details. ## Building Node.js on supported platforms -*Note:* All prerequisites can be easily installed by following -[this bootstrapping guide](https://github.com/nodejs/node/blob/master/tools/bootstrap/README.md). +The [bootstrapping guide](https://github.com/nodejs/node/blob/master/tools/bootstrap/README.md) +explains how to install all prerequisites. ### Unix/macOS @@ -160,7 +158,7 @@ The forthcoming OpenSSL-1.1.1 will have different requirements. Please refer to * Python 2.6 or 2.7 * GNU Make 3.81 or newer -On macOS, you will need to install the `Xcode Command Line Tools` by running +On macOS, install the `Xcode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and @@ -181,11 +179,10 @@ $ ./configure $ make -j4 ``` -Running `make` with the `-j4` flag will cause it to run 4 compilation jobs -concurrently which may significantly reduce build time. The number after `-j` -can be changed to best suit the number of processor cores on your machine. If -you run into problems running `make` with concurrency, try running it without -the `-j4` flag. See the +The `-j4` option will cause `make` to run 4 simultaneous compilation jobs which +may reduce build time. Change the number after `-j` to best suit the number of +processor cores on your machine. If you run into problems running `make` with +concurrency, try running it without the `-j4` flag. See the [GNU Make Documentation](https://www.gnu.org/software/make/manual/html_node/Parallel.html) for more information. From 4959a5f9c3dc255c91f15fc4b626ac8d7c6cf653 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 8 Nov 2018 10:37:43 -0800 Subject: [PATCH 2/4] fixup! doc: edit BUILDING.md --- BUILDING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index be2a85d8e2b083..81be5e3a3353fa 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -134,7 +134,7 @@ OpenSSL-1.1.0 requires the following assembler version for use of asm support on x86_64 and ia32. * gas (GNU assembler) version 2.23 or higher -* xcode version 5.0 or higher +* Xcode version 5.0 or higher * llvm version 3.3 or higher * nasm version 2.10 or higher in Windows From a402eb82100e4ed2cff6532972f7b618b088b56b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 8 Nov 2018 16:14:42 -0800 Subject: [PATCH 3/4] fixup! fixup! doc: edit BUILDING.md --- BUILDING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 81be5e3a3353fa..594b344c0f4e90 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -138,8 +138,8 @@ support on x86_64 and ia32. * llvm version 3.3 or higher * nasm version 2.10 or higher in Windows -Otherwise `configure` will fail with an error. Avoid this by either providing a -newer assembler as per the list above or by using the `--openssl-no-asm` flag. +If compiling without one of the above, use `configure` with the +`--openssl-no-asm` flag. Otherwise, `configure` will fail. The forthcoming OpenSSL-1.1.1 will have different requirements. Please refer to https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html for details. From 556fb8ef5da9215a3fe82f7ae3ff21053dc695ad Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 9 Nov 2018 10:20:32 -0800 Subject: [PATCH 4/4] fixup! fixup! fixup! doc: edit BUILDING.md --- BUILDING.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 594b344c0f4e90..63ddf8e7f4ff2a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -180,11 +180,8 @@ $ make -j4 ``` The `-j4` option will cause `make` to run 4 simultaneous compilation jobs which -may reduce build time. Change the number after `-j` to best suit the number of -processor cores on your machine. If you run into problems running `make` with -concurrency, try running it without the `-j4` flag. See the -[GNU Make Documentation](https://www.gnu.org/software/make/manual/html_node/Parallel.html) -for more information. +may reduce build time. For more information, see the +[GNU Make Documentation](https://www.gnu.org/software/make/manual/html_node/Parallel.html). Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.