diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2018-07-06 05:33:32 -0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2018-07-06 10:46:30 -0400 |
| commit | 179eeb2b50ca49e9ff090e51f8c9f0d2b002cad5 (patch) | |
| tree | fb21a558fb396a6f1006771a3559dfa91ddaf620 | |
| parent | d30664958ec1031a99373414e17c124b4fa468fa (diff) | |
s/rust_deps/extern/g
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | build_extra/rust/rust.gni | 22 |
2 files changed, 12 insertions, 12 deletions
@@ -12,7 +12,7 @@ config("deno_config") { rust_executable("deno") { source_root = "src/main.rs" - rust_deps = [ ":libc" ] + extern = [ ":libc" ] deps = [ ":libdeno", ] diff --git a/build_extra/rust/rust.gni b/build_extra/rust/rust.gni index e3c412be2..985fff5f6 100644 --- a/build_extra/rust/rust.gni +++ b/build_extra/rust/rust.gni @@ -9,7 +9,7 @@ template("run_rustc") { "crate_type", "source_root", "deps", - "rust_deps", + "extern", ]) if (defined(invoker.crate_name)) { crate_name = invoker.crate_name @@ -72,15 +72,15 @@ template("run_rustc") { deps = [] } - if (defined(rust_deps)) { - deps += rust_deps - foreach(dep_label, rust_deps) { - dep_name = get_label_info(dep_label, "name") - dep_dir = get_label_info(dep_label, "target_out_dir") - dep_rlib = "$dep_dir/lib$dep_name.rlib" + if (defined(extern)) { + deps += extern + foreach(label, extern) { + name = get_label_info(label, "name") + dir = get_label_info(label, "target_out_dir") + rlib = "$dir/lib$name.rlib" args += [ "--extern", - "$dep_name=" + rebase_path(dep_rlib, root_build_dir), + "$name=" + rebase_path(rlib, root_build_dir), ] } } @@ -96,7 +96,7 @@ template("rust_component") { [ "crate_name", "crate_type", - "rust_deps", + "extern", "cfg", "source_root", ]) @@ -146,8 +146,8 @@ template("rust_executable") { stdlib_label, ] - if (defined(rust_deps)) { - deps += rust_deps + if (defined(extern)) { + deps += extern } } } |