Skip to content

Commit d1e9c4e

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

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

node.gyp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
'src/node_main_instance.cc',
134134
'src/node_messaging.cc',
135135
'src/node_metadata.cc',
136-
'src/node_diagnostics_channel.cc',
137136
'src/node_modules.cc',
138137
'src/node_options.cc',
139138
'src/node_os.cc',
@@ -271,7 +270,6 @@
271270
'src/node_messaging.h',
272271
'src/node_metadata.h',
273272
'src/node_mutex.h',
274-
'src/node_diagnostics_channel.h',
275273
'src/node_modules.h',
276274
'src/node_object_wrap.h',
277275
'src/node_options.h',
@@ -895,7 +893,6 @@
895893
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
896894
],
897895
'dependencies': [
898-
'tools/v8_gypfiles/abseil.gyp:abseil',
899896
'node_js2c#host',
900897
],
901898

@@ -956,6 +953,9 @@
956953
'src/node_snapshot_stub.cc',
957954
]
958955
}],
956+
[ 'node_use_bundled_v8!="false"', {
957+
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
958+
}],
959959
[ 'node_shared_gtest=="false"', {
960960
'dependencies': [
961961
'deps/googletest/googletest.gyp:gtest_prod',
@@ -1276,7 +1276,6 @@
12761276

12771277
'dependencies': [
12781278
'<(node_lib_target_name)',
1279-
'tools/v8_gypfiles/abseil.gyp:abseil',
12801279
],
12811280

12821281
'includes': [
@@ -1310,6 +1309,9 @@
13101309
[ 'node_shared_gtest=="true"', {
13111310
'libraries': [ '-lgtest_main' ],
13121311
}],
1312+
[ 'node_use_bundled_v8!="false"', {
1313+
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
1314+
}],
13131315
[ 'node_shared_hdr_histogram=="false"', {
13141316
'dependencies': [
13151317
'deps/histogram/histogram.gyp:histogram',
@@ -1548,7 +1550,7 @@
15481550
[ 'OS=="mac"', {
15491551
'libraries': [ '-framework CoreFoundation -framework Security' ],
15501552
}],
1551-
[ 'node_shared_simdutf=="false"', {
1553+
[ 'node_shared_simdutf=="false" and node_use_bundled_v8!="false"', {
15521554
'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
15531555
}],
15541556
[ '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)