From 9f2ea757775e08c02cb5732595bc9bf5299696a6 Mon Sep 17 00:00:00 2001
From: Lee Cannon <leecannon@leecannon.xyz>
Date: Thu, 29 Sep 2022 19:33:30 +0100
Subject: [PATCH] handle `OptionsStep` in build_runner (#686)

* handle `OptionsStep` in build_runner

* only reify `OptionsStep`s that have no dependencies
---
 src/special/build_runner.zig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/special/build_runner.zig b/src/special/build_runner.zig
index 2904c61..1cdc3d1 100644
--- a/src/special/build_runner.zig
+++ b/src/special/build_runner.zig
@@ -5,6 +5,7 @@ const process = std.process;
 const Builder = std.build.Builder;
 const InstallArtifactStep = std.build.InstallArtifactStep;
 const LibExeObjStep = std.build.LibExeObjStep;
+const OptionsStep = std.build.OptionsStep;
 
 pub const BuildConfig = struct {
     packages: []Pkg,
@@ -90,6 +91,14 @@ pub fn main() !void {
     var include_dirs: std.StringArrayHashMapUnmanaged(void) = .{};
     defer include_dirs.deinit(allocator);
 
+    // This scans the graph of Steps to find all `OptionsStep`s then reifies them
+    // Doing this before the loop to find packages ensures their `GeneratedFile`s have been given paths
+    for (builder.top_level_steps.items) |tls| {
+        for (tls.step.dependencies.items) |step| {
+            try reifyOptions(step);
+        }
+    }
+
     // TODO: We currently add packages from every LibExeObj step that the install step depends on.
     //       Should we error out or keep one step or something similar?
     // We also flatten them, we should probably keep the nested structure.
@@ -109,6 +118,19 @@ pub fn main() !void {
     );
 }
 
+fn reifyOptions(step: *std.build.Step) !void {
+    if (step.cast(OptionsStep)) |option| {
+        // We don't know how costly the dependency tree might be, so err on the side of caution
+        if (step.dependencies.items.len == 0) {
+            try option.step.make();
+        }
+    }
+
+    for (step.dependencies.items) |unknown_step| {
+        try reifyOptions(unknown_step);
+    }
+}
+
 fn processStep(
     allocator: std.mem.Allocator,
     packages: *std.ArrayListUnmanaged(BuildConfig.Pkg),