From 7a3632243202bb6c5be26a515b69d7e85f891a3a Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Tue, 15 May 2018 09:53:20 -0700
Subject: [PATCH] [gn] Include node/common.gypi when building node

Not sure how this ever worked, but the GN build certainly doesn't work
on Linux without this.
---
 build/node/BUILD.gn | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/node/BUILD.gn b/build/node/BUILD.gn
index 0ce0ceee3f8..2c6e67b8205 100644
--- a/build/node/BUILD.gn
+++ b/build/node/BUILD.gn
@@ -7,10 +7,11 @@ action("gyp_node") {
     "node.gypi",
   ]
   outputs = [
-    "$target_out_dir/Release_Base/build.ninja",
+    "$target_out_dir/Release/build.ninja",
   ]
   args = [
     "-I", rebase_path("node.gypi", root_build_dir),
+    "-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
     "-D", "component=shared_library",
     "-D", "buildtype=Custom",
     "-D", "target_arch=x64",
@@ -31,17 +32,17 @@ action("build_node") {
   ]
   script = "//electron/build/run-ninja.py"
   args = [
-    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release_Base",
+    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release",
     "node_lib"
   ]
   outputs = [
-    "$target_out_dir/Release_Base/libnode.dylib"
+    "$target_out_dir/Release/libnode.dylib"
   ]
 }
 
 copy("copy_node") {
   deps = [ ":build_node" ]
-  sources = [ "$target_out_dir/Release_Base/libnode.dylib" ]
+  sources = [ "$target_out_dir/Release/libnode.dylib" ]
   outputs = [ "$root_out_dir/{{source_file_part}}" ]
 }
 
@@ -52,7 +53,7 @@ config("node_config") {
     "//third_party/electron_node/deps/cares/include",
   ]
   libs = [
-    "$target_out_dir/Release_Base/libnode.dylib"
+    "$target_out_dir/Release/libnode.dylib"
   ]
   cflags_cc = [
     "-Wno-deprecated-declarations",