Skip to content

Commit 8b50a2d

Browse files
committed
fixup! build: add --shared-highway configure flag
1 parent 23438cb commit 8b50a2d

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

‎tools/v8_gypfiles/v8.gyp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@
636636
'run_torque',
637637
'v8_libbase',
638638
'fp16',
639-
'highway',
640639
'abseil.gyp:abseil',
641640
],
642641
'direct_dependent_settings': {
@@ -649,6 +648,9 @@
649648
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_snapshot_compression.*?sources \\+= ")',
650649
],
651650
}],
651+
['node_shared_highway=="false"', {
652+
'dependencies': ['highway'],
653+
}],
652654
['v8_enable_temporal_support==1', {
653655
'sources': [
654656
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_temporal_support.*?sources \\+= ")',
@@ -2444,35 +2446,10 @@
24442446
'target_name': 'highway',
24452447
'type': 'static_library',
24462448
'toolsets': ['host', 'target'],
2447-
'conditions': [['node_shared_highway=="false"', {
2448-
'variables': {
2449-
'HIGHWAY_ROOT': '../../deps/v8/third_party/highway',
2450-
},
2451-
'all_dependent_settings': {
2452-
'include_dirs': [
2453-
'<(HIGHWAY_ROOT)/src',
2454-
],
2455-
'conditions': [
2456-
['v8_target_arch=="ia32"', {
2457-
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2458-
}],
2459-
['v8_target_arch=="arm64"', {
2460-
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2461-
}],
2462-
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2463-
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2464-
}],
2465-
['v8_target_arch=="s390x"', {
2466-
'defines': ['HWY_BROKEN_EMU128=0',],
2467-
}],
2468-
['OS in "aix os400"', {
2469-
'defines': ['HWY_BROKEN_EMU128=0',],
2470-
}],
2471-
['v8_target_arch=="arm" and arm_version==7', {
2472-
'defines': ['HWY_BROKEN_EMU128=0',],
2473-
}],
2474-
],
2475-
},
2449+
'variables': {
2450+
'HIGHWAY_ROOT': '../../deps/v8/third_party/highway',
2451+
},
2452+
'all_dependent_settings': {
24762453
'include_dirs': [
24772454
'<(HIGHWAY_ROOT)/src',
24782455
],
@@ -2486,11 +2463,34 @@
24862463
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
24872464
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
24882465
}],
2466+
['v8_target_arch=="s390x"', {
2467+
'defines': ['HWY_BROKEN_EMU128=0',],
2468+
}],
2469+
['OS in "aix os400"', {
2470+
'defines': ['HWY_BROKEN_EMU128=0',],
2471+
}],
2472+
['v8_target_arch=="arm" and arm_version==7', {
2473+
'defines': ['HWY_BROKEN_EMU128=0',],
2474+
}],
24892475
],
2490-
'sources': [
2491-
'<!@pymod_do_main(GN-scraper "<(HIGHWAY_ROOT)/BUILD.gn" "source_set.\\"libhwy.*?sources = ")',
2492-
],
2493-
}]],
2476+
},
2477+
'include_dirs': [
2478+
'<(HIGHWAY_ROOT)/src',
2479+
],
2480+
'conditions': [
2481+
['v8_target_arch=="ia32"', {
2482+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2483+
}],
2484+
['v8_target_arch=="arm64"', {
2485+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2486+
}],
2487+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2488+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2489+
}],
2490+
],
2491+
'sources': [
2492+
'<!@pymod_do_main(GN-scraper "<(HIGHWAY_ROOT)/BUILD.gn" "source_set.\\"libhwy.*?sources = ")',
2493+
],
24942494
}, # highway
24952495
{
24962496
'target_name': 'simdutf',

0 commit comments

Comments
 (0)