diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 1fae5ebf4d444f..21df8496d17f55 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -2,10 +2,15 @@
- win
- osx
- freebsd
- linux-musl
+ win
+ osx
+ maccatalyst
+ iossimulator
+ ios
+ tvossimulator
+ tvos
+ freebsd
+ linux-musl
linux
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index c28a87aa84eac6..0d6271a0fae15b 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -15,12 +15,12 @@ The .NET Foundation licenses this file to you under the MIT license.
- gcc
+ gcc
clang
$(CppCompilerAndLinker)
ar
- --flat
- <_SymbolPrefix Condition="'$(TargetOS)' == 'osx'">_
+ --flat
+ <_SymbolPrefix Condition="'$(_IsApplePlatform)' == 'true'">_
true
@@ -35,16 +35,16 @@ The .NET Foundation licenses this file to you under the MIT license.
x86_64
- aarch64
- arm64
+ aarch64
+ arm64
$(CrossCompileArch)-linux-gnu
$(CrossCompileArch)-alpine-linux-musl
$(CrossCompileArch)-unknown-freebsd12
- $ORIGIN
- @executable_path
+ $ORIGIN
+ @executable_path
libeventpipe-disabled
libeventpipe-enabled
@@ -63,11 +63,13 @@ The .NET Foundation licenses this file to you under the MIT license.
-
+
+
-
-
+
+
+
@@ -100,52 +102,53 @@ The .NET Foundation licenses this file to you under the MIT license.
-
+
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -173,24 +176,24 @@ The .NET Foundation licenses this file to you under the MIT license.
<_WhereLinker>0
-
+
objcopy
llvm-objcopy
objcopy
-
+
-
-
+
-
+
@@ -201,16 +204,16 @@ The .NET Foundation licenses this file to you under the MIT license.
-
-
+
-
-
+
@@ -220,7 +223,7 @@ The .NET Foundation licenses this file to you under the MIT license.
-
+
$(DsymUtilOptions) --minimize
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index 64d2468572a65c..a1f03c0a6d2ed9 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -21,15 +21,22 @@ The .NET Foundation licenses this file to you under the MIT license.
$(OutputPath)native\
true
$(MSBuildThisFileDirectory)..\tools\netstandard\ILCompiler.Build.Tasks.dll
- windows
- osx
- freebsd
+ windows
+ osx
+ maccatalyst
+ iossimulator
+ ios
+ tvossimulator
+ tvos
+ freebsd
linux
true
false
true
false
+ <_IsiOSLikePlatform Condition="'$(TargetOS)' == 'maccatalyst' or $(TargetOS.StartsWith('ios')) or $(TargetOS.StartsWith('tvos'))">true
+ <_IsApplePlatform Condition="'$(TargetOS)' == 'osx' or '$(_IsiOSLikePlatform)' == 'true'">true
@@ -63,14 +70,14 @@ The .NET Foundation licenses this file to you under the MIT license.
.exe
.dll
- .dylib
- .so
+ .dylib
+ .so
.lib
.a
- .dwarf
+ .dwarf
.pdb
- .dbg
+ .dbg
.def
.exports
@@ -305,12 +312,12 @@ The .NET Foundation licenses this file to you under the MIT license.
-
-
+
+
-
+
@@ -325,8 +332,8 @@ The .NET Foundation licenses this file to you under the MIT license.
<_IgnoreLinkerWarnings>false
- <_IgnoreLinkerWarnings Condition="'$(TargetOS)' == 'osx'">true
- -x
+ <_IgnoreLinkerWarnings Condition="'$(_IsApplePlatform)' == 'true'">true
+ -x
@@ -341,13 +348,13 @@ The .NET Foundation licenses this file to you under the MIT license.
-
-