From 1de1f679ecf431742754ba4b9e4aed6d39272bb9 Mon Sep 17 00:00:00 2001 From: Stefan Stojanovic Date: Fri, 18 Nov 2022 20:41:01 +0100 Subject: [PATCH] Revert "build: remove precompiled header and debug information for host builds" This reverts commit 818284b68737bbb9098cf12b1b221cbb24f06ce8. Reverted commit is a no longer needed patch for ARM64 cross-compiling. It was increasing cross-compile time drastically (~3 times longer). PR-URL: https://github.com/nodejs/node/pull/45432 Refs: https://github.com/nodejs/node/pull/42538 Refs: https://github.com/nodejs/node/issues/42375 Reviewed-By: Luigi Pinca Reviewed-By: Yagiz Nizipli Reviewed-By: Rich Trott Reviewed-By: Stewart X Addison --- common.gypi | 6 +----- tools/v8_gypfiles/v8.gyp | 12 +++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/common.gypi b/common.gypi index 96d7ebe61acfeb..89f6e87c28af79 100644 --- a/common.gypi +++ b/common.gypi @@ -283,11 +283,7 @@ '-std:c++17' ], 'BufferSecurityCheck': 'true', - 'target_conditions': [ - ['_toolset=="target"', { - 'DebugInformationFormat': 1 # /Z7 embed info in .obj files - }], - ], + 'DebugInformationFormat': 1, # /Z7 embed info in .obj files 'ExceptionHandling': 0, # /EHsc 'MultiProcessorCompilation': 'true', 'StringPooling': 'true', # pool string literals diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index a078ca11953be8..fe658dbfc1d055 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -327,7 +327,7 @@ '<(V8_ROOT)/src/builtins/builtins-intl-gen.cc', ], }], - ['OS=="win" and _toolset=="target"', { + ['OS=="win"', { 'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h', 'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc', 'sources': [ @@ -685,7 +685,7 @@ ], 'sources': ['<@(v8_compiler_sources)'], 'conditions': [ - ['OS=="win" and _toolset=="target"', { + ['OS=="win"', { 'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h', 'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc', 'sources': [ @@ -710,7 +710,7 @@ ], 'sources': ['<@(v8_compiler_sources)'], 'conditions': [ - ['OS=="win" and _toolset=="target"', { + ['OS=="win"', { 'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h', 'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc', 'sources': [ @@ -912,15 +912,13 @@ '