Skip to content

Commit 7000af3

Browse files
committed
add freebsd-arm64 and freebsd-x64 support
1 parent 1b646a9 commit 7000af3

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/sdk/build/Vezel.Zig.Sdk.Cross.Host.targets

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727
</PropertyGroup>
2828

2929
<PropertyGroup>
30+
<HostSystem Condition="$(HostRuntimeIdentifier.StartsWith('freebsd-'))">freebsd</HostSystem>
3031
<HostSystem Condition="$(HostRuntimeIdentifier.StartsWith('linux-'))">linux</HostSystem>
3132
<HostSystem Condition="$(HostRuntimeIdentifier.StartsWith('osx-'))">macos</HostSystem>
3233
<HostSystem Condition="$(HostRuntimeIdentifier.StartsWith('win-'))">windows</HostSystem>
3334
</PropertyGroup>
3435

3536
<PropertyGroup>
3637
<HostAbi>gnu</HostAbi>
37-
<HostAbi Condition="'$(HostSystem)' == 'macos'">none</HostAbi>
38+
<HostAbi Condition="'$(HostSystem)' == 'freebsd' or '$(HostSystem)' == 'macos'">none</HostAbi>
3839
<HostAbi Condition="'$(HostSystem)' == 'windows'">msvc</HostAbi>
3940
<HostAbi Condition="$(HostRuntimeIdentifier.Contains('-musl-'))">musl</HostAbi>
4041
<HostAbi Condition="'$(HostArchitecture)' == 'arm'">$(HostAbi)eabihf</HostAbi>
42+
<HostAbi Condition="'$(HostArchitecture)' == 'arm' and '$(HostSystem)' != 'linux'">eabihf</HostAbi>
4143
</PropertyGroup>
4244

4345
<PropertyGroup>
@@ -46,6 +48,7 @@
4648
</PropertyGroup>
4749

4850
<PropertyGroup>
51+
<HostLibrary Condition="'$(HostSystem)' == 'freebsd'">fbsd</HostLibrary>
4952
<HostLibrary Condition="'$(HostSystem)' == 'linux'">glibc</HostLibrary>
5053
<HostLibrary Condition="'$(HostSystem)' == 'macos'">libsystem</HostLibrary>
5154
<HostLibrary Condition="'$(HostSystem)' == 'windows'">msvcrt</HostLibrary>
@@ -56,7 +59,7 @@
5659
<HostTriple>$(HostArchitecture)-$(HostSystem)-$(HostAbi)</HostTriple>
5760
</PropertyGroup>
5861

59-
<PropertyGroup Condition="'$(HostSystem)' == 'linux'">
62+
<PropertyGroup Condition="'$(HostSystem)' == 'freebsd' or '$(HostSystem)' == 'linux'">
6063
<HostLibraryPrefix>lib</HostLibraryPrefix>
6164
<HostLibrarySuffix>.so</HostLibrarySuffix>
6265
</PropertyGroup>

src/sdk/build/Vezel.Zig.Sdk.Cross.Target.targets

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<TargetBits Condition="$(TargetArchitecture.Contains('64')) or '$(TargetArchitecture)' == 's390x'">64</TargetBits>
2828
</PropertyGroup>
2929

30+
<PropertyGroup Condition="$(TargetRuntimeIdentifier.StartsWith('freebsd-'))">
31+
<TargetSystem>freebsd</TargetSystem>
32+
<TargetSystemVersion>14.0</TargetSystemVersion>
33+
</PropertyGroup>
34+
3035
<PropertyGroup Condition="$(TargetRuntimeIdentifier.StartsWith('linux-'))">
3136
<TargetSystem>linux</TargetSystem>
3237
<TargetSystemVersion>3.10</TargetSystemVersion>
@@ -53,9 +58,10 @@
5358
<PropertyGroup>
5459
<TargetAbi>gnu</TargetAbi>
5560
<TargetAbi Condition="'$(TargetSystem)' == 'wasi' or $(TargetRuntimeIdentifier.Contains('-musl-'))">musl</TargetAbi>
56-
<TargetAbi Condition="'$(TargetSystem)' == 'macos'">none</TargetAbi>
61+
<TargetAbi Condition="'$(TargetSystem)' == 'freebsd' or '$(TargetSystem)' == 'macos'">none</TargetAbi>
5762
<TargetAbi Condition="'$(TargetSystem)' == 'windows' and '$(UseMicrosoftAbi)' == 'true'">msvc</TargetAbi>
5863
<TargetAbi Condition="'$(TargetArchitecture)' == 'arm'">$(TargetAbi)eabihf</TargetAbi>
64+
<TargetAbi Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetSystem)' != 'linux'">eabihf</TargetAbi>
5965
</PropertyGroup>
6066

6167
<PropertyGroup>
@@ -65,6 +71,7 @@
6571

6672
<PropertyGroup>
6773
<TargetLibrary>glibc</TargetLibrary>
74+
<TargetLibrary Condition="'$(TargetSystem)' == 'freebsd'">fbsd</TargetLibrary>
6875
<TargetLibrary Condition="'$(TargetSystem)' == 'wasi' or $(TargetAbi.StartsWith('musl'))">musl</TargetLibrary>
6976
<TargetLibrary Condition="'$(TargetSystem)' == 'macos'">libsystem</TargetLibrary>
7077
<TargetLibrary Condition="'$(TargetSystem)' == 'windows'">msvcrt</TargetLibrary>
@@ -84,7 +91,7 @@
8491
<FullTargetTriple>$(TargetArchitecture)-$(TargetSystem)$(_TargetSystemSuffix)-$(TargetAbi)$(_TargetLibrarySuffix)</FullTargetTriple>
8592
</PropertyGroup>
8693

87-
<PropertyGroup Condition="'$(TargetSystem)' == 'linux'">
94+
<PropertyGroup Condition="'$(TargetSystem)' == 'freebsd' or '$(TargetSystem)' == 'linux'">
8895
<TargetLibraryPrefix>lib</TargetLibraryPrefix>
8996
<TargetLibrarySuffix>.so</TargetLibrarySuffix>
9097
</PropertyGroup>

src/sdk/build/Vezel.Zig.Sdk.Emulator.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<_QemuName Condition="'$(TargetArchitecture)' == 'x86'">qemu-i386</_QemuName>
1313
</PropertyGroup>
1414

15-
<PropertyGroup Condition="'$(TargetSystem)' == 'linux' and '$(HostSystem)' == 'linux'">
15+
<PropertyGroup Condition="('$(TargetSystem)' == 'linux' or '$(TargetSystem)' == 'freebsd') and '$(TargetSystem)' == '$(HostSystem)'">
1616
<_EmulatorName>$(_QemuName)</_EmulatorName>
1717
<_EmulatorCommand>$(_QemuName)</_EmulatorCommand>
1818
</PropertyGroup>

0 commit comments

Comments
 (0)