diff --git a/common.gypi b/common.gypi index 1e399772811019..079ebb1f0a91b9 100644 --- a/common.gypi +++ b/common.gypi @@ -19,7 +19,6 @@ 'node_use_bundled_v8%': 'true', 'node_module_version%': '', 'node_with_ltcg%': '', - 'node_use_pch%': 'false', 'node_shared_openssl%': 'false', 'node_tag%': '', @@ -38,7 +37,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.12', + 'v8_embedder_string': '-node.13', ##### V8 defaults for Node.js ##### diff --git a/configure.py b/configure.py index 5a7cade60cb657..74fffa9b2e9918 100755 --- a/configure.py +++ b/configure.py @@ -448,11 +448,6 @@ dest='with_ltcg', help='Use Link Time Code Generation. This feature is only available on Windows.') -parser.add_option('--with-pch', - action='store_true', - dest='with_pch', - help='Use Precompiled Headers (only available on Windows).') - intl_optgroup.add_option('--download', action='store', dest='download_list', @@ -1070,11 +1065,6 @@ def configure_node(o): if flavor != 'win' and options.with_ltcg: raise Exception('Link Time Code Generation is only supported on Windows.') - if flavor == 'win': - o['variables']['node_use_pch'] = b(options.with_pch) - else: - o['variables']['node_use_pch'] = 'false' - if options.tag: o['variables']['node_tag'] = '-' + options.tag else: diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index de8fd92f7d58ff..857ff0ecece3a8 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -365,7 +365,7 @@ }, }, ], - ['OS=="win" and node_use_pch == "true"', { + ['OS=="win"', { 'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h', 'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc', 'sources': [ @@ -1936,20 +1936,11 @@ }], ['OS=="win"', { 'msvs_disabled_warnings': [4351, 4355, 4800], - 'conditions': [ - ['node_use_pch != "true"', { - # When building Official, the .lib is too large and exceeds the 2G - # limit. This breaks it into multiple pieces to avoid the limit. - # See http://crbug.com/485155. - 'msvs_shard': 4, - }, { '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)', - ], - }], + 'sources': [ + '<(_msvs_precompiled_header)', + '<(_msvs_precompiled_source)', ], # This will prevent V8's .cc files conflicting with the inspector's # .cpp files in the same shard. diff --git a/node.gypi b/node.gypi index cbedd8028a5425..f528a2082ea48d 100644 --- a/node.gypi +++ b/node.gypi @@ -65,16 +65,14 @@ 'NOMINMAX', '_UNICODE=1', ], - }, { # POSIX - 'defines': [ '__POSIX__' ], - }], - [ 'node_use_pch=="true"', { 'msvs_precompiled_header': 'tools/msvs/pch/node_pch.h', 'msvs_precompiled_source': 'tools/msvs/pch/node_pch.cc', 'sources': [ '<(_msvs_precompiled_header)', '<(_msvs_precompiled_source)', ], + }, { # POSIX + 'defines': [ '__POSIX__' ], }], [ 'node_enable_d8=="true"', { 'dependencies': [ 'deps/v8/gypfiles/d8.gyp:d8' ], diff --git a/vcbuild.bat b/vcbuild.bat index aa96555e88d28a..92e20d0f05b948 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -16,7 +16,6 @@ set config=Release set target=Build set target_arch=x64 set ltcg= -set pch=1 set target_env= set noprojgen= set projgen= @@ -63,7 +62,7 @@ set doc= :next-arg if "%1"=="" goto args-done if /i "%1"=="debug" set config=Debug&goto arg-ok -if /i "%1"=="release" set config=Release&set ltcg=1&set "pch="&set cctest=1&goto arg-ok +if /i "%1"=="release" set config=Release&set ltcg=1&set cctest=1&goto arg-ok if /i "%1"=="clean" set target=Clean&goto arg-ok if /i "%1"=="ia32" set target_arch=x86&goto arg-ok if /i "%1"=="x86" set target_arch=x86&goto arg-ok @@ -77,7 +76,6 @@ if /i "%1"=="sign" set sign=1&goto arg-ok if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok if /i "%1"=="noetw" set noetw=1&goto arg-ok if /i "%1"=="ltcg" set ltcg=1&goto arg-ok -if /i "%1"=="nopch" set "pch="&goto arg-ok if /i "%1"=="licensertf" set licensertf=1&goto arg-ok if /i "%1"=="test" set test_args=%test_args% -J %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %common_test_suites%&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&goto arg-ok @@ -158,7 +156,6 @@ if defined build_release ( set projgen=1 set cctest=1 set ltcg=1 - set "pch=" ) if defined msi set stage_package=1 @@ -174,7 +171,6 @@ if "%config%"=="Debug" set configure_flags=%configure_flags% --debug if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1 if defined ltcg set configure_flags=%configure_flags% --with-ltcg -if defined pch set configure_flags=%configure_flags% --with-pch if defined release_urlbase set configure_flags=%configure_flags% --release-urlbase=%release_urlbase% if defined download_arg set configure_flags=%configure_flags% %download_arg% if defined enable_vtune_arg set configure_flags=%configure_flags% --enable-vtune-profiling @@ -670,7 +666,7 @@ del .used_configure_flags goto exit :help -echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [noetw] [ltcg] [nopch] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] +echo vcbuild.bat [debug/release] [msi] [doc] [test/test-ci/test-all/test-addons/test-js-native-api/test-node-api/test-benchmark/test-internet/test-pummel/test-simple/test-message/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [noetw] [ltcg] [licensetf] [sign] [ia32/x86/x64] [vs2017] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-js-ci/lint-md] [lint-md-build] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm] echo Examples: echo vcbuild.bat : builds release build echo vcbuild.bat debug : builds debug build