From 632ca2bd1c7b33a9c1aebb5b10c97fb37b2b591d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Tue, 19 Oct 2021 22:29:34 +0200
Subject: [PATCH] maybe?

---
 tools/v8_gypfiles/v8.gyp | 180 ++++++++-------------------------------
 1 file changed, 35 insertions(+), 145 deletions(-)

diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 771c64648b1c49..0f4ade38e45c4b 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -50,10 +50,10 @@
     {
       'target_name': 'run_torque',
       'type': 'none',
+      'toolsets': ['host', 'target'],
       'conditions': [
         ['want_separate_host_toolset', {
           'dependencies': ['torque#host'],
-          'toolsets': ['host', 'target'],
         }, {
           'dependencies': ['torque'],
         }],
@@ -111,10 +111,8 @@
       'target_name': 'v8_maybe_icu',
       'type': 'none',
       'hard_dependency': 1,
+      'toolsets': ['host', 'target'],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['v8_enable_i18n_support==1', {
           'dependencies': [
             '<(icu_gyp_path):icui18n',
@@ -130,11 +128,7 @@
     {
       'target_name': 'torque_runtime_support',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<(V8_ROOT)/src/torque/runtime-support.h',
@@ -145,11 +139,7 @@
       'target_name': 'torque_generated_initializers',
       'type': 'none',
       'hard_dependency': 1,
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
@@ -172,11 +162,7 @@
       'target_name': 'torque_generated_definitions',
       'type': 'none',
       'hard_dependency': 1,
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
@@ -204,10 +190,10 @@
       'target_name': 'generate_bytecode_builtins_list',
       'type': 'none',
       'hard_dependency': 1,
+      'toolsets': ['host', 'target'],
       'conditions': [
         ['want_separate_host_toolset', {
           'dependencies': ['bytecode_builtins_list_generator#host'],
-          'toolsets': ['host', 'target'],
         }, {
           'dependencies': ['bytecode_builtins_list_generator'],
         }],
@@ -242,11 +228,7 @@
     {
       'target_name': 'v8_init',
       'type': 'static_library',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
@@ -261,6 +243,7 @@
     {
       'target_name': 'v8_initializers',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'torque_generated_initializers',
         'v8_base_without_compiler',
@@ -274,9 +257,6 @@
         '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_initializers.*?sources = ")',
       ],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['v8_enable_webassembly==1', {
           'sources': [
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_initializers.*?v8_enable_webassembly.*?sources \\+= ")',
@@ -466,11 +446,7 @@
     {
       'target_name': 'v8_version',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<(V8_ROOT)/include/v8-value-serializer-version.h',
@@ -482,11 +458,7 @@
     {
       'target_name': 'v8_config_headers',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<(V8_ROOT)/include/v8-platform.h',
@@ -497,11 +469,7 @@
     {
       'target_name': 'v8_headers',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_config_headers',
         'cppgc_headers',
@@ -519,11 +487,7 @@
     {
       'target_name': 'v8_shared_internal_headers',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_headers',
         'v8_libbase',
@@ -539,11 +503,7 @@
     {
       'target_name': 'v8_flags',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_shared_internal_headers',
       ],
@@ -557,11 +517,7 @@
     {
       'target_name': 'v8_internal_headers',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'torque_runtime_support',
         'v8_flags',
@@ -696,6 +652,7 @@
     {
       'target_name': 'v8_compiler_opt',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
@@ -707,9 +664,6 @@
       ],
       'sources': ['<@(v8_compiler_sources)'],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', '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',
@@ -723,6 +677,7 @@
     {
       'target_name': 'v8_compiler',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
@@ -734,9 +689,6 @@
       ],
       'sources': ['<@(v8_compiler_sources)'],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', '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',
@@ -751,15 +703,13 @@
       'target_name': 'v8_compiler_for_mksnapshot',
       'type': 'none',
       'hard_dependency': 1,
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'generate_bytecode_builtins_list',
         'run_torque',
         'v8_maybe_icu',
       ],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['is_component_build and not v8_optimized_debug and v8_enable_fast_mksnapshot', {
           'dependencies': [
             'v8_compiler_opt',
@@ -780,6 +730,7 @@
     {
       'target_name': 'v8_base_without_compiler',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'torque_generated_definitions',
         'v8_bigint',
@@ -822,9 +773,6 @@
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_enable_webassembly.*?sources \\+= ")',
           ],
         }],
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['v8_target_arch=="ia32"', {
           'sources': [
             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x86.*?sources \\+= ")',
@@ -999,11 +947,7 @@
     {
       'target_name': 'v8_base',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_base_without_compiler',
         'v8_compiler',
@@ -1012,11 +956,7 @@
     {
       'target_name': 'torque_base',
       'type': 'static_library',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'sources': [
         '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"torque_base.*?sources = ")',
       ],
@@ -1043,11 +983,7 @@
     {
       'target_name': 'torque_ls_base',
       'type': 'static_library',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'sources': [
         '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"torque_ls_base.*?sources = ")',
       ],
@@ -1073,6 +1009,7 @@
     {
       'target_name': 'v8_libbase',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'sources': [
         '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libbase.*?sources = ")',
       ],
@@ -1082,9 +1019,6 @@
       ],
 
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['is_component_build', {
           'defines': ["BUILDING_V8_BASE_SHARED"],
         }],
@@ -1331,6 +1265,7 @@
     {
       'target_name': 'v8_libplatform',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_libbase',
       ],
@@ -1362,9 +1297,6 @@
         '<(V8_ROOT)/src/libplatform/worker-thread.h',
       ],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['component=="shared_library"', {
           'direct_dependent_settings': {
             'defines': ['USING_V8_PLATFORM_SHARED'],
@@ -1411,11 +1343,7 @@
     {
       'target_name': 'v8_libsampler',
       'type': 'static_library',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': [
         'v8_libbase',
       ],
@@ -1427,11 +1355,7 @@
     {
       'target_name': 'bytecode_builtins_list_generator',
       'type': 'executable',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host'],
-        }],
-      ],
+      'toolsets': ['host'],
       'defines!': [
         'BUILDING_V8_SHARED=1',
       ],
@@ -1451,6 +1375,7 @@
     {
       'target_name': 'mksnapshot',
       'type': 'executable',
+      'toolsets': ['host'],
       'dependencies': [
         'v8_base_without_compiler',
         'v8_compiler_for_mksnapshot',
@@ -1463,24 +1388,15 @@
       'sources': [
         '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"mksnapshot.*?sources = ")',
       ],
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host'],
-        }],
-      ],
     },  # mksnapshot
     {
       'target_name': 'torque',
       'type': 'executable',
+      'toolsets': ['host'],
       'dependencies': [
         'torque_base',
         # "build/win:default_exe_manifest",
       ],
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host'],
-        }],
-      ],
       'defines!': [
         '_HAS_EXCEPTIONS=0',
         'BUILDING_V8_SHARED=1',
@@ -1510,11 +1426,7 @@
     {
       'target_name': 'torque-language-server',
       'type': 'executable',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host'],
-        }],
-      ],
+      'toolsets': ['host'],
       'dependencies': [
         'torque_base',
         'torque_ls_base',
@@ -1537,16 +1449,12 @@
     {
       'target_name': 'gen-regexp-special-case',
       'type': 'executable',
+      'toolsets': ['host'],
       'dependencies': [
         'v8_libbase',
         # "build/win:default_exe_manifest",
         'v8_maybe_icu',
       ],
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host'],
-        }],
-      ],
       'sources': [
         "<(V8_ROOT)/src/regexp/gen-regexp-special-case.cc",
         "<(V8_ROOT)/src/regexp/special-case.h",
@@ -1555,10 +1463,10 @@
     {
       'target_name': 'run_gen-regexp-special-case',
       'type': 'none',
+      'toolsets': ['host', 'target'],
       'conditions': [
         ['want_separate_host_toolset', {
           'dependencies': ['gen-regexp-special-case#host'],
-          'toolsets': ['host', 'target'],
         }, {
           'dependencies': ['gen-regexp-special-case'],
         }],
@@ -1584,11 +1492,7 @@
     {
       'target_name': 'cppgc_headers',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "v8_header_set.\\"cppgc_headers.*?sources = ")',
@@ -1598,11 +1502,7 @@
     {
       'target_name': 'cppgc_base',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "v8_source_set.\\"cppgc_base.*?sources = ")',
@@ -1612,11 +1512,7 @@
     {
       'target_name': 'v8_bigint',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'direct_dependent_settings': {
         'sources': [
           '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "v8_source_set.\\"v8_bigint.*?sources = ")',
@@ -1836,11 +1732,7 @@
     {
       'target_name': 'postmortem-metadata',
       'type': 'none',
-      'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
-      ],
+      'toolsets': ['host', 'target'],
       'dependencies': ['run_torque'],
       'variables': {
         'heapobject_files': [
@@ -1934,10 +1826,8 @@
     {
       'target_name': 'v8_zlib',
       'type': 'static_library',
+      'toolsets': ['host', 'target'],
       'conditions': [
-        ['want_separate_host_toolset', {
-          'toolsets': ['host', 'target'],
-        }],
         ['OS=="win"', {
           'conditions': [
             ['"<(target_arch)"=="arm64" and _toolset=="target"', {