Add CompileStep APIs to Build.Module.

lib/std/Build.zig

@@ -556,11 +556,13 @@ pub const AddModuleOptions = struct {
     dependencies: []const ModuleDependency = &.{},
 };
 
-pub fn addModule(b: *Build, options: AddModuleOptions) void {
-    b.modules.put(b.dupe(options.name), b.createModule(.{
+pub fn addModule(b: *Build, options: AddModuleOptions) *Module {
+    const module = b.createModule(.{
         .source_file = options.source_file,
         .dependencies = options.dependencies,
-    })) catch @panic("OOM");
+    });
+    b.modules.put(b.dupe(options.name), module) catch @panic("OOM");
+    return module;
 }
 
 pub const ModuleDependency = struct {
@@ -1596,6 +1598,45 @@ pub const Module = struct {
     /// file of directory of files which constitute the module.
     source_file: FileSource,
     dependencies: std.StringArrayHashMap(*Module),
+    include_dirs: std.ArrayListUnmanaged(CompileStep.IncludeDir) = .{},
+    lib_paths: std.ArrayListUnmanaged([]const u8) = .{},
+    system_libs: std.ArrayListUnmanaged([]const u8) = .{},
+    libs: std.ArrayListUnmanaged(*Build.CompileStep) = .{},
+    config_headers: std.ArrayListUnmanaged(*Build.ConfigHeaderStep) = .{},
+    link_libc: bool = false,
+    link_libcpp: bool = false,
+
+    pub fn addIncludePath(m: *Module, path: []const u8) void {
+        m.include_dirs.append(
+            m.builder.allocator,
+            CompileStep.IncludeDir{ .raw_path = m.builder.dupe(path) },
+        ) catch @panic("OOM");
+    }
+
+    pub fn addConfigHeader(m: *Module, config_header: *Build.ConfigHeaderStep) void {
+        m.config_headers.append(config_header) catch @panic("OOM");
+    }
+
+    pub fn addLibraryPath(m: *Module, library_path: []const u8) void {
+        m.lib_paths.append(m.builder.dupe(library_path)) catch @panic("OOM");
+    }
+
+    pub fn linkLibC(m: *Module) void {
+        m.link_libc = true;
+    }
+
+    pub fn linkLibCpp(m: *Module) void {
+        m.link_libcpp = true;
+    }
+
+    pub fn linkLibrary(m: *Module, lib: *Build.CompileStep) void {
+        m.libs.append(m.builder.allocator, lib) catch @panic("OOM");
+    }
+
+    pub fn linkSystemLibrary(m: *Module, lib: []const u8) void {
+        // TODO: Ignoring `needed` and `weak` variants for now.
+        m.system_libs.append(m.builder.allocator, m.builder.dupe(lib)) catch @panic("OOM");
+    }
 };
 
 /// A file that is generated by a build step.

lib/std/Build/CompileStep.zig

@@ -984,6 +984,35 @@ fn addRecursiveBuildDeps(cs: *CompileStep, module: *Module, done: *std.AutoHashM
     if (done.contains(module)) return;
     try done.put(module, {});
     module.source_file.addStepDependencies(&cs.step);
+
+    for (module.include_dirs.items) |include_dir| {
+        cs.include_dirs.append(include_dir) catch @panic("OOM");
+    }
+
+    for (module.lib_paths.items) |lib_path| {
+        cs.addLibraryPath(lib_path);
+    }
+
+    for (module.config_headers.items) |config_header| {
+        cs.addConfigHeader(config_header);
+    }
+
+    for (module.libs.items) |lib| {
+        cs.linkLibrary(lib);
+    }
+
+    for (module.system_libs.items) |system_lib| {
+        cs.linkSystemLibrary(system_lib);
+    }
+
+    if (module.link_libc) {
+        cs.linkLibC();
+    }
+
+    if (module.link_libcpp) {
+        cs.linkLibCpp();
+    }
+
     for (module.dependencies.values()) |dep| {
         try cs.addRecursiveBuildDeps(dep, done);
     }