@@ -41,42 +41,8 @@ const Blake3 = std.crypto.hash.Blake3;
41
41
42
42
const LibCTarget = struct {
43
43
name : []const u8 ,
44
- arch : MultiArch ,
45
- abi : MultiAbi ,
46
- };
47
-
48
- const MultiArch = union (enum ) {
49
- aarch64 ,
50
- arm ,
51
- x86_64 ,
52
- specific : Arch ,
53
-
54
- fn eql (a : MultiArch , b : MultiArch ) bool {
55
- if (@intFromEnum (a ) != @intFromEnum (b ))
56
- return false ;
57
- if (a != .specific )
58
- return true ;
59
- return a .specific == b .specific ;
60
- }
61
- };
62
-
63
- const MultiAbi = union (enum ) {
64
- musl ,
65
- specific : Abi ,
66
-
67
- fn eql (a : MultiAbi , b : MultiAbi ) bool {
68
- if (@intFromEnum (a ) != @intFromEnum (b ))
69
- return false ;
70
- if (std .meta .Tag (MultiAbi )(a ) != .specific )
71
- return true ;
72
- return a .specific == b .specific ;
73
- }
74
- };
75
-
76
- const targets_dirs = &[_ ][]const u8 {
77
- "aarch64-linux-ohos" ,
78
- "arm-linux-ohos" ,
79
- "x86_64-linux-ohos" ,
44
+ arch : Arch ,
45
+ abi : Abi ,
80
46
};
81
47
82
48
fn is_in_array (value : []const u8 , array : []const []const u8 ) bool {
@@ -91,18 +57,18 @@ fn is_in_array(value: []const u8, array: []const []const u8) bool {
91
57
const musl_targets = [_ ]LibCTarget {
92
58
LibCTarget {
93
59
.name = "aarch64" ,
94
- .arch = MultiArch .aarch64 ,
95
- .abi = MultiAbi . musl ,
60
+ .arch = Arch .aarch64 ,
61
+ .abi = Abi . ohos ,
96
62
},
97
63
LibCTarget {
98
64
.name = "arm" ,
99
- .arch = MultiArch .arm ,
100
- .abi = MultiAbi . musl ,
65
+ .arch = Arch .arm ,
66
+ .abi = Abi . ohoseabi ,
101
67
},
102
68
LibCTarget {
103
69
.name = "x86_64" ,
104
- .arch = MultiArch .x86_64 ,
105
- .abi = MultiAbi . musl ,
70
+ .arch = Arch .x86_64 ,
71
+ .abi = Abi . ohos ,
106
72
},
107
73
};
108
74
@@ -294,14 +260,10 @@ pub fn main() !void {
294
260
var ohos_common_content = HashToContents .init (allocator );
295
261
296
262
for (musl_targets ) | libc_target | {
297
- var abi : []const u8 = "ohos" ;
298
- if (std .mem .eql (u8 , libc_target .name , "arm" )) {
299
- abi = "ohoseabi" ;
300
- }
301
263
const target = try std .fmt .allocPrint (allocator , "{s}-{s}-{s}" , .{
302
264
libc_target .name ,
303
265
"linux" ,
304
- abi ,
266
+ libc_target . abi ,
305
267
});
306
268
307
269
const arch_generic_hash_content = generateGenericFileMap (allocator , &[_ ][]const u8 { generic_musl_libc_dir , "arch" , libc_target .name }) catch | err | {
0 commit comments