Merge pull request #327 from dtolnay/bazel

Combine bazel codegen steps into one run of cxxbridge

Author: dtolnay

tools/bazel/rust_cxx_bridge.bzl

@@ -7,40 +7,42 @@ def rust_cxx_bridge(
         include_prefix = None,
         strip_include_prefix = None,
         deps = []):
-    run_binary(
+    native.alias(
         name = "%s/header" % name,
-        srcs = [src],
-        outs = [src + ".h"],
-        args = [
-            "$(location %s)" % src,
-            "-o",
-            "$(location %s.h)" % src,
-            "--header",
-        ],
-        tool = "//:codegen",
+        actual = src + ".h",
     )
 
-    run_binary(
+    native.alias(
         name = "%s/source" % name,
+        actual = src + ".cc",
+    )
+
+    run_binary(
+        name = "%s/generated" % name,
         srcs = [src],
-        outs = [src + ".cc"],
+        outs = [
+            src + ".h",
+            src + ".cc",
+        ],
         args = [
             "$(location %s)" % src,
             "-o",
+            "$(location %s.h)" % src,
+            "-o",
             "$(location %s.cc)" % src,
         ],
         tool = "//:codegen",
     )
 
     cc_library(
         name = name,
-        srcs = [":%s/source" % name],
+        srcs = [src + ".cc"],
         deps = deps + [":%s/include" % name],
     )
 
     cc_library(
         name = "%s/include" % name,
-        hdrs = [":%s/header" % name],
+        hdrs = [src + ".h"],
         include_prefix = include_prefix,
         strip_include_prefix = strip_include_prefix,
     )