Skip to content

Commit 661e3f1

Browse files
committed
build: fix ata build for shared library configurations
1 parent 087b3f8 commit 661e3f1

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

deps/ata/ata.gyp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@
1212
'direct_dependent_settings': {
1313
'include_dirs': ['.'],
1414
},
15-
'dependencies': [
16-
'../simdjson/simdjson.gyp:simdjson',
17-
],
18-
'defines': [
19-
'ATA_NO_RE2',
20-
],
21-
'sources': [
22-
'<@(ata_sources)',
23-
],
2415
'conditions': [
16+
['node_shared_simdjson=="false"', {
17+
'dependencies': [
18+
'../simdjson/simdjson.gyp:simdjson',
19+
],
20+
}],
2521
['OS=="win"', {
2622
'msvs_settings': {
2723
'VCCLCompilerTool': {
@@ -35,6 +31,12 @@
3531
},
3632
}],
3733
],
34+
'defines': [
35+
'ATA_NO_RE2',
36+
],
37+
'sources': [
38+
'<@(ata_sources)',
39+
],
3840
},
3941
]
4042
}

node.gypi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@
237237
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
238238
}],
239239

240-
[ 'node_shared_simdjson=="false"', {
240+
# ata is always built from source (no shared library option).
241+
# When simdjson is shared, ata still links against the shared lib
242+
# through its own simdjson dependency in ata.gyp.
243+
['1==1', {
241244
'dependencies': [ 'deps/ata/ata.gyp:ata' ],
242245
}],
243246

0 commit comments

Comments
 (0)