Skip to content

Commit 171c8f4

Browse files
committed
build: do not always build the default V8 snapshot
It should be skipped if Node.js is built with the --without-snapshot configure flag. PR-URL: #28467 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3c418d9 commit 171c8f4

File tree

2 files changed

+37
-13
lines changed

2 files changed

+37
-13
lines changed

common.gypi

+36-12
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,49 @@
8484
}, {
8585
'openssl_no_asm%': 0,
8686
}],
87-
['GENERATOR=="ninja"', {
88-
'obj_dir': '<(PRODUCT_DIR)/obj',
89-
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
90-
}, {
91-
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
92-
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
93-
}],
9487
['OS == "win"', {
9588
'os_posix': 0,
9689
'v8_postmortem_support%': 0,
97-
'obj_dir': '<(PRODUCT_DIR)/obj',
98-
'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
9990
}, {
10091
'os_posix': 1,
10192
'v8_postmortem_support%': 1,
10293
}],
103-
['OS == "mac"', {
104-
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
105-
'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
94+
['v8_use_snapshot==1', {
95+
'conditions': [
96+
['GENERATOR == "ninja"', {
97+
'obj_dir': '<(PRODUCT_DIR)/obj',
98+
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
99+
}, {
100+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
101+
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
102+
}],
103+
['OS == "win"', {
104+
'obj_dir': '<(PRODUCT_DIR)/obj',
105+
'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
106+
}],
107+
['OS == "mac"', {
108+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
109+
'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
110+
}],
111+
],
112+
}, {
113+
'conditions': [
114+
['GENERATOR == "ninja"', {
115+
'obj_dir': '<(PRODUCT_DIR)/obj',
116+
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_nosnapshot.a',
117+
}, {
118+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
119+
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_nosnapshot.a',
120+
}],
121+
['OS == "win"', {
122+
'obj_dir': '<(PRODUCT_DIR)/obj',
123+
'v8_base': '<(PRODUCT_DIR)/lib/libv8_nosnapshot.a',
124+
}],
125+
['OS == "mac"', {
126+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
127+
'v8_base': '<(PRODUCT_DIR)/libv8_nosnapshot.a',
128+
}],
129+
],
106130
}],
107131
['openssl_fips != ""', {
108132
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',

node.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}],
7171
[ 'node_use_bundled_v8=="true"', {
7272
'dependencies': [
73-
'tools/v8_gypfiles/v8.gyp:v8_snapshot',
73+
'tools/v8_gypfiles/v8.gyp:v8_maybe_snapshot',
7474
'tools/v8_gypfiles/v8.gyp:v8_libplatform',
7575
],
7676
}],

0 commit comments

Comments
 (0)