From 5b137b63d5559e2c18c88f7bcea5824b424788d7 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 12 Feb 2020 11:07:27 -0800 Subject: [PATCH] Remove macro generation in GN build files https://github.com/nodejs/node/pull/30755 --- patches/node/build_add_gn_build_files.patch | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index ce984a7bc4466..e8cf6d682d53e 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -10,7 +10,7 @@ new file mode 100644 index 0000000000000000000000000000000000000000..ec06e14dd327cdf89dc6fd584b6972ae64311ea0 --- /dev/null +++ b/BUILD.gn -@@ -0,0 +1,370 @@ +@@ -0,0 +1,357 @@ +import("//electron/build/asar.gni") +import("//v8/gni/v8.gni") + @@ -88,28 +88,15 @@ index 0000000000000000000000000000000000000000..ec06e14dd327cdf89dc6fd584b6972ae + ":generate_config_gypi", + ":node_js2c_inputs", + ] -+ -+ macro_inputs = [] -+ if (!node_use_dtrace && !node_use_etw) { -+ macro_inputs += [ "tools/js2c_macros/notrace_macros.py" ] -+ } -+ if (node_debug_lib) { -+ macro_inputs += [ "tools/js2c_macros/nodcheck_macros.py" ] -+ } else { -+ macro_inputs += [ "tools/js2c_macros/dcheck_macros.py" ] -+ } -+ macro_inputs += [ "tools/js2c_macros/check_macros.py" ] -+ + config_gypi = [ "$target_gen_dir/config.gypi" ] -+ -+ inputs = library_files + macro_inputs + config_gypi ++ inputs = library_files + config_gypi + outputs = [ + "$target_gen_dir/node_javascript.cc", + ] + + cwd = "$target_gen_dir/js2c_inputs" + script = "tools/js2c.py" -+ args = library_files + rebase_path(macro_inputs + config_gypi) + ["--target"] + rebase_path(outputs) ++ args = library_files + rebase_path(config_gypi) + ["--target"] + rebase_path(outputs) +} + +config("node_features") {