| Index: third_party/cython/rules.gni
|
| diff --git a/third_party/cython/rules.gni b/third_party/cython/rules.gni
|
| index 1d2ccfb33df7601a93604d8ef525bbe1e9778c48..cea1e363cbd95137b698e0ee923af97002e4a2f8 100644
|
| --- a/third_party/cython/rules.gni
|
| +++ b/third_party/cython/rules.gni
|
| @@ -22,26 +22,20 @@ template("python_binary_module_sources") {
|
| sources = invoker.sources
|
| outputs = [ cython_output ]
|
| args = [
|
| - "--cplus",
|
| - "-I",
|
| - rebase_path("//", root_build_dir),
|
| - "-o",
|
| - rebase_path(cython_output, root_build_dir),
|
| - ] + rebase_path(sources, root_build_dir)
|
| + "--cplus",
|
| + "-I",
|
| + rebase_path("//", root_build_dir),
|
| + "-o",
|
| + rebase_path(cython_output, root_build_dir),
|
| + ] + rebase_path(sources, root_build_dir)
|
| }
|
|
|
| config(config_name) {
|
| visibility = target_visibility
|
| python_flags = "//third_party/cython/python_flags.py"
|
| - include_dirs = exec_script(python_flags,
|
| - [ "--includes" ],
|
| - "list lines")
|
| - libs = exec_script(python_flags,
|
| - [ "--libraries" ],
|
| - "list lines")
|
| - lib_dirs = exec_script(python_flags,
|
| - [ "--library_dirs" ],
|
| - "list lines")
|
| + include_dirs = exec_script(python_flags, [ "--includes" ], "list lines")
|
| + libs = exec_script(python_flags, [ "--libraries" ], "list lines")
|
| + lib_dirs = exec_script(python_flags, [ "--library_dirs" ], "list lines")
|
| if (!is_win) {
|
| # Generated code includes static utility functions that often go unused.
|
| cflags = [ "-Wno-unused-function" ]
|
| @@ -49,7 +43,9 @@ template("python_binary_module_sources") {
|
| }
|
|
|
| source_set(target_name) {
|
| - deps = [ ":$generator_target_name" ]
|
| + deps = [
|
| + ":$generator_target_name",
|
| + ]
|
| if (defined(invoker.visibility)) {
|
| visibility = invoker.visibility
|
| }
|
| @@ -59,7 +55,9 @@ template("python_binary_module_sources") {
|
| if (defined(invoker.datadeps)) {
|
| datadeps = invoker.datadeps
|
| }
|
| - sources = [ cython_output ]
|
| + sources = [
|
| + cython_output,
|
| + ]
|
| if (defined(invoker.additional_sources)) {
|
| sources += invoker.additional_sources
|
| }
|
| @@ -95,7 +93,9 @@ template("python_binary_module") {
|
|
|
| shared_library(shared_library_name) {
|
| visibility = target_visibility
|
| - deps = [ ":$sources_target_name" ]
|
| + deps = [
|
| + ":$sources_target_name",
|
| + ]
|
| if (defined(invoker.deps)) {
|
| deps += invoker.deps
|
| }
|
| @@ -113,11 +113,12 @@ template("python_binary_module") {
|
| copy(target_name) {
|
| python_base_module = invoker.python_base_module
|
| sources = [
|
| - "$root_out_dir/${shared_library_prefix}${shared_library_name}${shared_library_suffix}"
|
| + "$root_out_dir/${shared_library_prefix}${shared_library_name}${shared_library_suffix}",
|
| ]
|
| - outputs = [
|
| - "$root_out_dir/python/$python_base_module/${target_name}${python_module_suffix}"
|
| + outputs =
|
| + [ "$root_out_dir/python/$python_base_module/${target_name}${python_module_suffix}" ]
|
| + deps = [
|
| + ":$shared_library_name",
|
| ]
|
| - deps = [ ":$shared_library_name" ]
|
| }
|
| }
|
|
|