Merge pull request #12948 from nornagon/node-config

[gn] Include node/common.gypi when building node
This commit is contained in:
Jeremy Apthorp 2018-05-15 10:42:29 -07:00 коммит произвёл GitHub
Родитель 6a4d9309b2 7a36322432
Коммит 0fb6dc79d8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -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",