Skip to content

Commit d84077b

Browse files
committed
build: do not depend on V8 deps on --without-bundled-v8 builds
1 parent 2ae6d8f commit d84077b

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

node.gyp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
'src/node_main_instance.cc',
134134
'src/node_messaging.cc',
135135
'src/node_metadata.cc',
136-
'src/node_diagnostics_channel.cc',
136+
'src/node_diagnostics_channel.h',
137137
'src/node_modules.cc',
138138
'src/node_options.cc',
139139
'src/node_os.cc',
@@ -895,7 +895,6 @@
895895
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
896896
],
897897
'dependencies': [
898-
'tools/v8_gypfiles/abseil.gyp:abseil',
899898
'node_js2c#host',
900899
],
901900

@@ -956,6 +955,9 @@
956955
'src/node_snapshot_stub.cc',
957956
]
958957
}],
958+
[ 'node_use_bundled_v8!="false"', {
959+
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
960+
}],
959961
[ 'node_shared_gtest=="false"', {
960962
'dependencies': [
961963
'deps/googletest/googletest.gyp:gtest_prod',
@@ -1276,7 +1278,6 @@
12761278

12771279
'dependencies': [
12781280
'<(node_lib_target_name)',
1279-
'tools/v8_gypfiles/abseil.gyp:abseil',
12801281
],
12811282

12821283
'includes': [
@@ -1310,6 +1311,9 @@
13101311
[ 'node_shared_gtest=="true"', {
13111312
'libraries': [ '-lgtest_main' ],
13121313
}],
1314+
[ 'node_use_bundled_v8!="false"', {
1315+
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
1316+
}],
13131317
[ 'node_shared_hdr_histogram=="false"', {
13141318
'dependencies': [
13151319
'deps/histogram/histogram.gyp:histogram',
@@ -1548,7 +1552,7 @@
15481552
[ 'OS=="mac"', {
15491553
'libraries': [ '-framework CoreFoundation -framework Security' ],
15501554
}],
1551-
[ 'node_shared_simdutf=="false"', {
1555+
[ 'node_shared_simdutf=="false" and node_use_bundled_v8!="false"', {
15521556
'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
15531557
}],
15541558
[ 'node_shared_libuv=="false"', {

tools/nix/v8.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
116116
117117
# copy v8 headers
118118
cp -r deps/v8/include $out/
119+
install -Dm0644 deps/v8/third_party/simdutf/simdutf.h -t $out/include/third_party/simdutf
120+
find deps/v8/third_party/abseil-cpp/absl -name '*.h' -print0 | while read -d $'\0' header_file; do
121+
install -Dm0644 "$header_file" -t "$out/include/$(dirname "''${header_file##deps/v8/third_party/abseil-cpp/}")"
122+
done
119123
120124
# create a pkgconfig file for v8
121125
mkdir -p $out/lib/pkgconfig
@@ -124,7 +128,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
124128
Description: V8 JavaScript Engine build for Node.js CI
125129
Version: ${version}
126130
Libs: -L$out/lib $libs
127-
Cflags: -I$out/include
131+
Cflags: -I$out/include -I$out/include/third_party/simdutf
128132
EOF
129133
'';
130134
})

0 commit comments

Comments
 (0)