diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2024-10-06 16:26:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-06 16:26:24 +0200 |
| commit | ece265b1c23202adedfdfdbbcb537ba4e81801d1 (patch) | |
| tree | 34d239993ade8eb3a1d41a45ce3dfb08d29ab123 /src/target.zig | |
| parent | be5378b03805fa95b3cf36b6727d2c364c155e64 (diff) | |
| parent | 19924280446ca02bb680357ad976857a087e91d2 (diff) | |
| download | zig-ece265b1c23202adedfdfdbbcb537ba4e81801d1.tar.gz zig-ece265b1c23202adedfdfdbbcb537ba4e81801d1.zip | |
Merge pull request #21605 from alexrp/ohos-stuff
`std.Target`: Introduce `Abi.ohoseabi` to distinguish the soft float case.
Diffstat (limited to 'src/target.zig')
| -rw-r--r-- | src/target.zig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/target.zig b/src/target.zig index 5847d3d8cd..95c9798f65 100644 --- a/src/target.zig +++ b/src/target.zig @@ -45,8 +45,7 @@ pub fn requiresPIC(target: std.Target, linking_libc: bool) bool { return target.isAndroid() or target.os.tag == .windows or target.os.tag == .uefi or osRequiresLibC(target) or - (linking_libc and target.isGnuLibC()) or - (target.abi == .ohos and target.cpu.arch == .aarch64); + (linking_libc and target.isGnuLibC()); } pub fn picLevel(target: std.Target) u32 { @@ -306,7 +305,7 @@ pub fn libcFullLinkFlags(target: std.Target) []const []const u8 { "-lc", "-lnetwork", }, - else => if (target.isAndroid()) &[_][]const u8{ + else => if (target.isAndroid() or target.abi.isOpenHarmony()) &[_][]const u8{ "-lm", "-lc", "-ldl", |