@@ -19,16 +19,13 @@ options: *Options,
1919package_name_stdout : LazyPath ,
2020
2121pub fn create (owner : * std.Build , options : * Options , package_name_stdout : LazyPath ) void {
22- const builtin_options_update = owner .allocator .create (@This () ) catch @panic ("OOM" );
22+ const builtin_options_update = owner .allocator .create (BuiltinOptionsUpdate ) catch @panic ("OOM" );
2323 builtin_options_update .* = .{
2424 .step = Step .init (.{
2525 .id = base_id ,
2626 .name = androidbuild .runNameContext ("builtin_options_update" ),
2727 .owner = owner ,
28- .makeFn = comptime if (std .mem .eql (u8 , builtin .zig_version_string , "0.13.0" ))
29- make013
30- else
31- makeLatest ,
28+ .makeFn = make ,
3229 }),
3330 .options = options ,
3431 .package_name_stdout = package_name_stdout ,
@@ -39,21 +36,9 @@ pub fn create(owner: *std.Build, options: *Options, package_name_stdout: LazyPat
3936 package_name_stdout .addStepDependencies (& builtin_options_update .step );
4037}
4138
42- /// make for zig 0.13.0
43- fn make013 (step : * Step , prog_node : std.Progress.Node ) ! void {
44- _ = prog_node ; // autofix
45- try make (step );
46- }
47-
48- /// make for zig 0.14.0+
49- fn makeLatest (step : * Step , options : Build.Step.MakeOptions ) ! void {
50- _ = options ; // autofix
51- try make (step );
52- }
53-
54- fn make (step : * Step ) ! void {
39+ fn make (step : * Step , _ : Build.Step.MakeOptions ) ! void {
5540 const b = step .owner ;
56- const builtin_options_update : * @This () = @fieldParentPtr ("step" , step );
41+ const builtin_options_update : * BuiltinOptionsUpdate = @fieldParentPtr ("step" , step );
5742 const options = builtin_options_update .options ;
5843
5944 const package_name_path = builtin_options_update .package_name_stdout .getPath2 (b , step );
0 commit comments