diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-02-03 16:03:14 -0500 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-02-14 15:14:42 -0500 |
| commit | cd5c7bf240f92d2a5007f1e0de1dfc76d54222fd (patch) | |
| tree | 0dfc5c7b8ec5c5da48bedac0ff5d9d171df42e03 | |
| parent | 82b798907d201bfb88bfadee24cf31d87d1bc70c (diff) | |
| download | android-node-v8-cd5c7bf240f92d2a5007f1e0de1dfc76d54222fd.tar.gz android-node-v8-cd5c7bf240f92d2a5007f1e0de1dfc76d54222fd.tar.bz2 android-node-v8-cd5c7bf240f92d2a5007f1e0de1dfc76d54222fd.zip | |
build,deps: use PCH also for v8_initializers
* rename files to represent reuse
PR-URL: https://github.com/nodejs/node/pull/25931
Reviewed-By: João Reis <reis@janeasystems.com>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/gypfiles/v8.gyp | 23 | ||||
| -rw-r--r-- | tools/msvs/pch/pch_v8_base.cc | 1 | ||||
| -rw-r--r-- | tools/msvs/pch/v8_pch.cc | 1 | ||||
| -rw-r--r-- | tools/msvs/pch/v8_pch.h (renamed from tools/msvs/pch/pch_v8_base.h) | 0 |
5 files changed, 16 insertions, 11 deletions
diff --git a/common.gypi b/common.gypi index 3736ec5af1..1e39977281 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.11', + 'v8_embedder_string': '-node.12', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index dd0f6799d5..1c219fad50 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -222,7 +222,7 @@ 'dependencies': [ 'v8_base', ], - 'variables': { + 'variables': { 'optimize': 'max', }, 'include_dirs': [ @@ -359,16 +359,20 @@ }], # Platforms that don't have Compare-And-Swap support need to link atomic # library to implement atomic memory access - [ 'v8_current_cpu == "mips" or v8_current_cpu == "mipsel" or ' - 'v8_current_cpu == "mips64" or v8_current_cpu == "mips64el" or ' - 'v8_current_cpu == "ppc" or v8_current_cpu == "ppc64" or ' - 'v8_current_cpu == "s390" or v8_current_cpu == "s390x"', - { + [ 'v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390", "s390x"]', { 'link_settings': { 'libraries': [ '-latomic', ], }, }, ], + ['OS=="win" and node_use_pch == "true"', { + 'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h', + 'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc', + 'sources': [ + '<(_msvs_precompiled_header)', + '<(_msvs_precompiled_source)', + ], + }], ], }, # v8_initializers { @@ -1942,10 +1946,11 @@ # See http://crbug.com/485155. 'msvs_shard': 4, }, { - 'msvs_precompiled_header': 'tools/msvs/pch/pch_v8_base.h', - 'msvs_precompiled_source': '../../../tools/msvs/pch/pch_v8_base.cc', + 'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h', + 'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc', 'sources': [ - '../../../tools/msvs/pch/pch_v8_base.cc', + '<(_msvs_precompiled_header)', + '<(_msvs_precompiled_source)', ], }], ], diff --git a/tools/msvs/pch/pch_v8_base.cc b/tools/msvs/pch/pch_v8_base.cc deleted file mode 100644 index d0666ed3d4..0000000000 --- a/tools/msvs/pch/pch_v8_base.cc +++ /dev/null @@ -1 +0,0 @@ -#include "pch_v8_base.h" diff --git a/tools/msvs/pch/v8_pch.cc b/tools/msvs/pch/v8_pch.cc new file mode 100644 index 0000000000..03a5d999d3 --- /dev/null +++ b/tools/msvs/pch/v8_pch.cc @@ -0,0 +1 @@ +#include "v8_pch.h" diff --git a/tools/msvs/pch/pch_v8_base.h b/tools/msvs/pch/v8_pch.h index 2c543beac2..2c543beac2 100644 --- a/tools/msvs/pch/pch_v8_base.h +++ b/tools/msvs/pch/v8_pch.h |