Skip to content

Commit 2012bc3

Browse files
committed
src: allow embedders to override NODE_MODULE_VERSION
nodejs/node#49279
1 parent c6be022 commit 2012bc3

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

patches/node/build_add_gn_build_files.patch

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ index 0000000000000000000000000000000000000000..e2b19b7500b4710e3a55e08f662d989c
156156
+ "NODE_IMPLEMENTATION",
157157
+ ]
158158
+ if (node_module_version != "") {
159-
+ defines += [ "NODE_MODULE_VERSION=" + node_module_version ]
159+
+ defines += [ "NODE_EMBEDDER_MODULE_VERSION=" + node_module_version ]
160160
+ }
161161
+ if (is_component_build) {
162162
+ defines += [
@@ -2061,21 +2061,6 @@ index 0000000000000000000000000000000000000000..4ab828dcbf322a9e28674e48c4a6868b
20612061
+ script = "../../tools/compress_json.py"
20622062
+ args = rebase_path(inputs + outputs, root_build_dir)
20632063
+}
2064-
diff --git a/src/node_version.h b/src/node_version.h
2065-
index 88cc915177bcf8b86eb8f9f16b215cb6d06b3aa7..8df52c22dd76a850d421075effc44fbfb32307db 100644
2066-
--- a/src/node_version.h
2067-
+++ b/src/node_version.h
2068-
@@ -89,7 +89,10 @@
2069-
* version matching should open a pull request to reserve a number in this
2070-
* registry.
2071-
*/
2072-
+// Electron sets NODE_MODULE_VERSION in their GN configuration
2073-
+#ifndef NODE_MODULE_VERSION
2074-
#define NODE_MODULE_VERSION 108
2075-
+#endif
2076-
2077-
// The NAPI_VERSION provided by this version of the runtime. This is the version
2078-
// which the Node binary being built supports.
20792064
diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
20802065
new file mode 100755
20812066
index 0000000000000000000000000000000000000000..616dc0c61ed4ea1bf2fb9e4768ba2ec566a83e42

0 commit comments

Comments
 (0)