Switch to prelude's build script runner

3 files changed, 28 insertions, 15 deletions

diff --git a/third-party/BUCK b/third-party/BUCK
index 0bdd4681..29efee6e 100644
--- a/third-party/BUCK
+++ b/third-party/BUCK
@@ -1,7 +1,7 @@
 # @generated by `reindeer buckify`
 
-load("//tools/buck:buildscript.bzl", "buildscript_args")
 load("//tools/buck:third_party.bzl", "third_party_rust_library")
+load("@prelude//rust:cargo_buildscript.bzl", "buildscript_run")
 
 http_archive(
     name = "bitflags-1.3.2.crate",
@@ -203,7 +203,7 @@ third_party_rust_library(
     ],
     rustc_flags = [
         "--cap-lints=allow",
-        "@$(location :proc-macro2-1.0.53-build-script-build-args)",
+        "@$(location :proc-macro2-1.0.53-build-script-run[rustc_flags])",
     ],
     visibility = [],
     deps = [":unicode-ident-1.0.8"],
@@ -224,8 +224,8 @@ rust_binary(
     visibility = [],
 )
 
-buildscript_args(
-    name = "proc-macro2-1.0.53-build-script-build-args",
+buildscript_run(
+    name = "proc-macro2-1.0.53-build-script-run",
     package_name = "proc-macro2",
     buildscript_rule = ":proc-macro2-1.0.53-build-script-build",
     features = [
@@ -233,7 +233,6 @@ buildscript_args(
         "proc-macro",
         "span-locations",
     ],
-    outfile = "args.txt",
     version = "1.0.53",
 )
 
@@ -263,7 +262,7 @@ third_party_rust_library(
     ],
     rustc_flags = [
         "--cap-lints=allow",
-        "@$(location :quote-1.0.26-build-script-build-args)",
+        "@$(location :quote-1.0.26-build-script-run[rustc_flags])",
     ],
     visibility = [],
     deps = [":proc-macro2-1.0.53"],
@@ -283,15 +282,14 @@ rust_binary(
     visibility = [],
 )
 
-buildscript_args(
-    name = "quote-1.0.26-build-script-build-args",
+buildscript_run(
+    name = "quote-1.0.26-build-script-run",
     package_name = "quote",
     buildscript_rule = ":quote-1.0.26-build-script-build",
     features = [
         "default",
         "proc-macro",
     ],
-    outfile = "args.txt",
     version = "1.0.26",
 )
 
@@ -316,12 +314,29 @@ third_party_rust_library(
     crate_root = "scratch-1.0.5.crate/src/lib.rs",
     edition = "2015",
     env = {
-        "OUT_DIR": "generated",
+        "OUT_DIR": "$(location :scratch-1.0.5-build-script-run[out_dir])",
     },
     rustc_flags = ["--cap-lints=allow"],
     visibility = [],
 )
 
+rust_binary(
+    name = "scratch-1.0.5-build-script-build",
+    srcs = [":scratch-1.0.5.crate"],
+    crate = "build_script_build",
+    crate_root = "scratch-1.0.5.crate/build.rs",
+    edition = "2015",
+    rustc_flags = ["--cap-lints=allow"],
+    visibility = [],
+)
+
+buildscript_run(
+    name = "scratch-1.0.5-build-script-run",
+    package_name = "scratch",
+    buildscript_rule = ":scratch-1.0.5-build-script-build",
+    version = "1.0.5",
+)
+
 alias(
     name = "syn",
     actual = ":syn-2.0.10",
diff --git a/third-party/fixups/scratch/fixups.toml b/third-party/fixups/scratch/fixups.toml
index 72f4bdd0..ac9ebfb4 100644
--- a/third-party/fixups/scratch/fixups.toml
+++ b/third-party/fixups/scratch/fixups.toml
@@ -1,4 +1,2 @@
-buildscript = []
-
-[env]
-OUT_DIR = "generated"
+[[buildscript]]
+[buildscript.gen_srcs]
diff --git a/third-party/reindeer.toml b/third-party/reindeer.toml
index b5a5c3c8..00be7fd6 100644
--- a/third-party/reindeer.toml
+++ b/third-party/reindeer.toml
@@ -9,7 +9,7 @@ generated_file_header = """
 # \u0040generated by `reindeer buckify`
 """
 buckfile_imports = """
-load("//tools/buck:buildscript.bzl", "buildscript_args")
 load("//tools/buck:third_party.bzl", "third_party_rust_library")
+load("@prelude//rust:cargo_buildscript.bzl", "buildscript_run")
 """
 rust_library = "third_party_rust_library"