diff options
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | build_extra/deno.gni (renamed from deno.gni) | 0 | ||||
| -rw-r--r-- | build_extra/rust/BUILD.gn | 15 | ||||
| -rw-r--r-- | build_extra/rust/empty.rs (renamed from src/empty.rs) | 0 | ||||
| -rw-r--r-- | build_extra/rust/rust.gni (renamed from rust.gni) | 93 | ||||
| -rwxr-xr-x | tools/format.sh | 5 |
6 files changed, 76 insertions, 43 deletions
@@ -2,8 +2,8 @@ import("//third_party/v8/gni/v8.gni") import("//third_party/v8/snapshot_toolchain.gni") import("//third_party/flatbuffers/flatbuffer.gni") import("//third_party/flatbuffers/ts_flatbuffer.gni") -import("deno.gni") -import("rust.gni") +import("//build_extra/deno.gni") +import("//build_extra/rust/rust.gni") config("deno_config") { include_dirs = [ "third_party/v8" ] # This allows us to v8/src/base/ libraries. @@ -18,7 +18,7 @@ rust_executable("deno") { ] } -rust_library("libc") { +rust_component("libc") { source_root = "third_party/rust_crates/libc/src/lib.rs" cfg = [ "feature=\"default\"", diff --git a/deno.gni b/build_extra/deno.gni index a8804e9f9..a8804e9f9 100644 --- a/deno.gni +++ b/build_extra/deno.gni diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn new file mode 100644 index 000000000..e5a4fec16 --- /dev/null +++ b/build_extra/rust/BUILD.gn @@ -0,0 +1,15 @@ +import("rust.gni") + +# By compiling an empty file as crate-type=staticlib we get all the code +# for the rust stdlib, which are not included in the object file outputs +# of other libs. +rust_component("stdlib") { + crate_type = "staticlib" + source_root = "empty.rs" + if (current_os == "mac") { + libs = [ "resolv" ] + } + if (current_os == "win") { + libs = [ "userenv.lib" ] + } +} diff --git a/src/empty.rs b/build_extra/rust/empty.rs index 8b1378917..8b1378917 100644 --- a/src/empty.rs +++ b/build_extra/rust/empty.rs diff --git a/rust.gni b/build_extra/rust/rust.gni index 218ab1299..e3c412be2 100644 --- a/rust.gni +++ b/build_extra/rust/rust.gni @@ -1,5 +1,8 @@ -template("rust_crate") { +stdlib_label = "//build_extra/rust:stdlib" + +template("run_rustc") { action(target_name) { + assert(defined(invoker.source_root), "Must specify source_root") forward_variables_from(invoker, [ "cfg", @@ -8,6 +11,12 @@ template("rust_crate") { "deps", "rust_deps", ]) + if (defined(invoker.crate_name)) { + crate_name = invoker.crate_name + } else { + crate_name = target_name + } + sources = [ source_root, ] @@ -18,26 +27,26 @@ template("rust_crate") { args = [ "rustc", rebase_path(source_root, root_build_dir), - "--crate-name=$target_name", + "--crate-name=$crate_name", "--crate-type=$crate_type", "--emit=dep-info=" + rebase_path(depfile, root_build_dir), ] # We only use staticlib for the special "empty" lib. if (crate_type == "staticlib") { - staticlib = "$target_out_dir/$target_name.a" + staticlib = "$target_out_dir/$crate_name.a" outputs += [ staticlib ] args += [ "--emit=link=" + rebase_path(staticlib, root_build_dir) ] } if (crate_type == "rlib" || crate_type == "bin") { - obj = "$target_out_dir/$target_name.o" + obj = "$target_out_dir/$crate_name.o" outputs += [ obj ] args += [ "--emit=obj=" + rebase_path(obj, root_build_dir) ] } if (crate_type == "rlib") { - rlib = "$target_out_dir/lib$target_name.rlib" + rlib = "$target_out_dir/lib$crate_name.rlib" outputs += [ rlib ] args += [ "--emit=link=" + rebase_path(rlib, root_build_dir) ] } @@ -78,29 +87,53 @@ template("rust_crate") { } } -template("rust_library") { - rust_crate(target_name) { - crate_type = "rlib" - forward_variables_from(invoker, "*") +template("rust_component") { + rustc_name = target_name + "_rustc" + rustc_label = ":" + rustc_name + crate_name = target_name + run_rustc(rustc_name) { + forward_variables_from(invoker, + [ + "crate_name", + "crate_type", + "rust_deps", + "cfg", + "source_root", + ]) + if (!defined(invoker.crate_type)) { + crate_type = "rlib" + } + } + + crate_outputs = get_target_outputs(rustc_label) + crate_obj = crate_outputs[0] + + component(target_name) { + forward_variables_from(invoker, + [ + "libs", + "deps", + ]) + if (!defined(deps)) { + deps = [] + } + if (!defined(libs)) { + libs = [] + } + libs += [ crate_obj ] + deps += [ rustc_label ] } } template("rust_executable") { - bin_target = target_name + "_bin" - rust_crate(bin_target) { + bin_name = target_name + "_bin" + bin_label = ":" + bin_name + + rust_component(bin_name) { crate_type = "bin" forward_variables_from(invoker, "*") } - # By compiling an empty file as crate-type=staticlib we get all the code - # for the rust stdlib, which are not included in the object file outputs - # of other libs. - stdlib_target = target_name + "_stdlib" - rust_crate(stdlib_target) { - crate_type = "staticlib" - source_root = "src/empty.rs" - } - executable(target_name) { forward_variables_from(invoker, "*") @@ -109,28 +142,12 @@ template("rust_executable") { } deps += [ - ":" + bin_target, - ":" + stdlib_target, + bin_label, + stdlib_label, ] - libs = get_target_outputs(":" + bin_target) + - get_target_outputs(":" + stdlib_target) - 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_obj = "$dep_dir/$dep_name.o" - libs += [ dep_obj ] - } - } - - if (current_os == "mac") { - libs += [ "resolv" ] - } - if (current_os == "win") { - libs += [ "userenv.lib" ] } } } diff --git a/tools/format.sh b/tools/format.sh index f0c7ec0a1..44ca815ff 100755 --- a/tools/format.sh +++ b/tools/format.sh @@ -4,8 +4,9 @@ cd `dirname "$0"`/.. clang-format -i -style Google src/*.cc src/*.h gn format BUILD.gn -gn format deno.gni -gn format rust.gni +gn format build_extra/deno.gni +gn format build_extra/rust/rust.gni +gn format build_extra/rust/BUILD.gn gn format .gn yapf -i js/*.py |