Skip to content

Commit 2a1fbf6

Browse files
committed
build: use shared simdutf from within V8
1 parent aa172a9 commit 2a1fbf6

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
12511251
$(RM) -r $(TARNAME)/deps/uv
12521252
$(RM) -r $(TARNAME)/deps/uvwasi
12531253
$(RM) -r $(TARNAME)/deps/v8/third_party/abseil-cpp
1254+
$(RM) -r $(TARNAME)/deps/v8/third_party/simdutf
12541255
$(RM) -r $(TARNAME)/deps/zlib
12551256
$(RM) -r $(TARNAME)/deps/zstd
12561257
else

deps/v8/src/builtins/builtins-typed-array.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "src/objects/objects-inl.h"
1515
#include "src/objects/option-utils.h"
1616
#include "src/objects/simd.h"
17-
#include "third_party/simdutf/simdutf.h"
17+
#include "simdutf.h"
1818

1919
namespace v8::internal {
2020

deps/v8/src/objects/string-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "src/torque/runtime-macro-shims.h"
3939
#include "src/torque/runtime-support.h"
4040
#include "src/utils/utils.h"
41-
#include "third_party/simdutf/simdutf.h"
41+
#include "simdutf.h"
4242

4343
// Has to be the last include (doesn't have include guards):
4444
#include "src/objects/object-macros.h"

deps/v8/src/objects/string.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "src/objects/tagged.h"
2222
#include "src/sandbox/external-pointer.h"
2323
#include "src/strings/unicode-decoder.h"
24-
#include "third_party/simdutf/simdutf.h"
24+
#include "simdutf.h"
2525

2626
// Has to be the last include (doesn't have include guards):
2727
#include "src/objects/object-macros.h"

deps/v8/src/strings/unicode-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "src/base/logging.h"
1212
#include "src/utils/utils.h"
13-
#include "third_party/simdutf/simdutf.h"
13+
#include "simdutf.h"
1414

1515
namespace unibrow {
1616

deps/v8/src/strings/unicode.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "unicode/uchar.h"
2222
#endif
2323

24-
#include "third_party/simdutf/simdutf.h"
24+
#include "simdutf.h"
2525

2626
namespace unibrow {
2727

tools/v8_gypfiles/v8.gyp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,16 +2439,20 @@
24392439
}, # highway
24402440
{
24412441
'target_name': 'simdutf',
2442-
'type': 'static_library',
2442+
'type': '<(library)',
24432443
'toolsets': ['host', 'target'],
24442444
'direct_dependent_settings': {
24452445
'include_dirs': [
24462446
'<(V8_ROOT)/third_party/simdutf',
24472447
],
24482448
},
24492449
'include_dirs': ['.'],
2450-
'sources': [
2451-
'<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
2450+
'conditions': [
2451+
['node_shared_simdutf=="false"', {
2452+
'sources': [
2453+
'<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
2454+
],
2455+
}],
24522456
],
24532457
}, # simdutf
24542458
],

0 commit comments

Comments
 (0)