Update NativeAOT build integration targets to include ioslike platforms #82086
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,12 +15,12 @@ The .NET Foundation licenses this file to you under the MIT license. | |
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <CppCompilerAndLinkerAlternative /> | ||
| <CppCompilerAndLinkerAlternative Condition="'$(CppCompilerAndLinker)' == '' and '$(_IsApplePlatform)' != 'true'">gcc</CppCompilerAndLinkerAlternative> | ||
| <CppCompilerAndLinker Condition="'$(CppCompilerAndLinker)' == ''">clang</CppCompilerAndLinker> | ||
| <CppLinker>$(CppCompilerAndLinker)</CppLinker> | ||
| <CppLibCreator>ar</CppLibCreator> | ||
| <DsymUtilOptions Condition="'$(_IsApplePlatform)' == 'true'">--flat</DsymUtilOptions> | ||
| <_SymbolPrefix Condition="'$(_IsApplePlatform)' == 'true'">_</_SymbolPrefix> | ||
| <UseLLVMLinker Condition="'$(UseLLVMLinker)' == '' and '$(TargetOS)' == 'freebsd'">true</UseLLVMLinker> | ||
| </PropertyGroup> | ||
|
|
||
|
|
@@ -35,16 +35,16 @@ The .NET Foundation licenses this file to you under the MIT license. | |
|
|
||
| <CrossCompileArch /> | ||
| <CrossCompileArch Condition="$(CrossCompileRid.EndsWith('-x64'))">x86_64</CrossCompileArch> | ||
| <CrossCompileArch Condition="$(CrossCompileRid.EndsWith('-arm64')) and '$(_IsApplePlatform)' != 'true'">aarch64</CrossCompileArch> | ||
| <CrossCompileArch Condition="$(CrossCompileRid.EndsWith('-arm64')) and '$(_IsApplePlatform)' == 'true'">arm64</CrossCompileArch> | ||
|
|
||
| <TargetTriple /> | ||
| <TargetTriple Condition="'$(CrossCompileArch)' != ''">$(CrossCompileArch)-linux-gnu</TargetTriple> | ||
| <TargetTriple Condition="'$(CrossCompileArch)' != '' and ($(CrossCompileRid.StartsWith('linux-musl')) or $(CrossCompileRid.StartsWith('alpine')))">$(CrossCompileArch)-alpine-linux-musl</TargetTriple> | ||
| <TargetTriple Condition="'$(CrossCompileArch)' != '' and ($(CrossCompileRid.StartsWith('freebsd')))">$(CrossCompileArch)-unknown-freebsd12</TargetTriple> | ||
|
|
||
| <IlcRPath Condition="'$(IlcRPath)' == '' and '$(_IsApplePlatform)' != 'true'">$ORIGIN</IlcRPath> | ||
| <IlcRPath Condition="'$(IlcRPath)' == '' and '$(_IsApplePlatform)' == 'true'">@executable_path</IlcRPath> | ||
|
|
||
| <EventPipeName>libeventpipe-disabled</EventPipeName> | ||
| <EventPipeName Condition="'$(EnableNativeEventPipe)' == 'true'">libeventpipe-enabled</EventPipeName> | ||
|
|
@@ -63,11 +63,13 @@ The .NET Foundation licenses this file to you under the MIT license. | |
|
|
||
| <ItemGroup> | ||
| <NetCoreAppNativeLibrary Include="System.Native" /> | ||
| <!-- FIXME: The library is currently not available for iOS-like platforms --> | ||
|
There was a problem hiding this comment. Do we have an issue we could link to? There was a problem hiding this comment. Just created and linked: #82389 |
||
| <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true' and '$(_IsiOSLikePlatform)' != 'true'" /> | ||
| <NetCoreAppNativeLibrary Include="System.IO.Compression.Native" /> | ||
| <NetCoreAppNativeLibrary Include="System.Net.Security.Native" /> | ||
| <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.Apple" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <!-- Not compliant for iOS-like platforms --> | ||
| <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.OpenSsl" Condition="'$(StaticOpenSslLinking)' != 'true' and '$(_IsiOSLikePlatform)' != 'true'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
|
|
@@ -100,52 +102,53 @@ The .NET Foundation licenses this file to you under the MIT license. | |
| <StaticSslLibs Include="-Wl,-Bdynamic" Condition="'$(StaticExecutable)' != 'true'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(_IsApplePlatform)' == 'true'"> | ||
akoeplinger marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <NativeFramework Include="CoreFoundation" /> | ||
| <NativeFramework Include="CryptoKit" /> | ||
| <NativeFramework Include="Foundation" /> | ||
| <NativeFramework Include="Security" /> | ||
| <!-- The library builds don't reference the GSS API on tvOS builds. --> | ||
| <NativeFramework Condition="!$(TargetOS.StartsWith('tvos'))" Include="GSS" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <LinkerArg Include="-fuse-ld=lld" Condition="'$(UseLLVMLinker)' == 'true'" /> | ||
| <LinkerArg Include="@(NativeLibrary)" /> | ||
| <LinkerArg Include="--sysroot=$(SysRoot)" Condition="'$(SysRoot)' != ''" /> | ||
| <LinkerArg Include="--target=$(TargetTriple)" Condition="'$(_IsApplePlatform)' != 'true' and '$(TargetTriple)' != ''" /> | ||
| <LinkerArg Include="-arch $(CrossCompileArch)" Condition="'$(_IsApplePlatform)' == 'true' and '$(CrossCompileArch)' != ''" /> | ||
| <LinkerArg Include="-g" Condition="$(NativeDebugSymbols) == 'true'" /> | ||
| <LinkerArg Include="-Wl,--strip-debug" Condition="$(NativeDebugSymbols) != 'true' and '$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-Wl,-rpath,'$(IlcRPath)'" Condition="'$(StaticExecutable)' != 'true'" /> | ||
| <LinkerArg Include="-Wl,--build-id=sha1" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-Wl,--as-needed" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-Wl,-e0x0" Condition="'$(NativeLib)' == 'Shared' and '$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-pthread" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-lstdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" /> | ||
| <LinkerArg Include="-ldl" /> | ||
| <LinkerArg Include="-lobjc" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <LinkerArg Include="-lswiftCore" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <LinkerArg Include="-lswiftFoundation" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <LinkerArg Include="-lz" /> | ||
| <LinkerArg Include="-lrt" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-licucore" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <LinkerArg Include="-L/usr/lib/swift" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| <LinkerArg Include="@(StaticNumaLibs)" Condition="'$(StaticNumaLinking)' == 'true'" /> | ||
| <LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" /> | ||
| <LinkerArg Include="@(StaticSslLibs)" Condition="'$(StaticOpenSslLinking)' == 'true'" /> | ||
| <LinkerArg Include="-lm" /> | ||
| <LinkerArg Include="-static" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' == 'false'" /> | ||
| <LinkerArg Include="-static-pie" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' != 'false'" /> | ||
| <LinkerArg Include="-dynamiclib" Condition="'$(_IsApplePlatform)' == 'true' and '$(NativeLib)' == 'Shared'" /> | ||
| <LinkerArg Include="-shared" Condition="'$(_IsApplePlatform)' != 'true' and '$(NativeLib)' == 'Shared'" /> | ||
| <!-- binskim warning BA3001 PIE disabled on executable --> | ||
| <LinkerArg Include="-pie -Wl,-pie" Condition="'$(_IsApplePlatform)' != 'true' and '$(NativeLib)' == '' and '$(StaticExecutable)' != 'true' and '$(PositionIndependentExecutable)' != 'false'" /> | ||
| <LinkerArg Include="-Wl,-no-pie" Condition="'$(_IsApplePlatform)' != 'true' and '$(NativeLib)' == '' and '$(StaticExecutable)' != 'true' and '$(PositionIndependentExecutable)' == 'false'" /> | ||
| <!-- binskim warning BA3010 The GNU_RELRO segment is missing --> | ||
| <LinkerArg Include="-Wl,-z,relro" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <!-- binskim warning BA3011 The BIND_NOW flag is missing --> | ||
| <LinkerArg Include="-Wl,-z,now" Condition="'$(_IsApplePlatform)' != 'true'" /> | ||
| <LinkerArg Include="-Wl,-u,$(_SymbolPrefix)NativeAOT_StaticInitialization" Condition="('$(UseLLVMLinker)' == 'true' or '$(_IsApplePlatform)' == 'true' or '$(TargetOS)' == 'freebsd') and ('$(NativeLib)' == 'Shared' or '$(CustomNativeMain)' == 'true')" /> | ||
| <LinkerArg Include="-Wl,--require-defined,NativeAOT_StaticInitialization" Condition="'$(UseLLVMLinker)' != 'true' and '$(TargetOS)' == 'linux' and ('$(NativeLib)' == 'Shared' or '$(CustomNativeMain)' == 'true')" /> | ||
| <!-- this workaround can be deleted once the minimum supported glibc version | ||
| (runtime's official build machine's glibc version) is at least 2.33 | ||
|
|
@@ -156,7 +159,7 @@ The .NET Foundation licenses this file to you under the MIT license. | |
| <!-- FreeBSD's inotify is an installed package and not found in default libraries --> | ||
| <LinkerArg Include="-L/usr/local/lib -linotify" Condition="'$(TargetOS)' == 'freebsd'" /> | ||
|
|
||
| <LinkerArg Include="@(NativeFramework->'-framework %(Identity)')" Condition="'$(_IsApplePlatform)' == 'true'" /> | ||
| </ItemGroup> | ||
|
|
||
| <Exec Command="command -v "$(CppLinker)"" IgnoreExitCode="true" StandardOutputImportance="Low"> | ||
|
|
@@ -173,24 +176,24 @@ The .NET Foundation licenses this file to you under the MIT license. | |
| <_WhereLinker>0</_WhereLinker> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(ObjCopyName)' == '' and '$(_IsApplePlatform)' != 'true'"> | ||
| <ObjCopyName Condition="!$(CppCompilerAndLinker.Contains('clang'))">objcopy</ObjCopyName> | ||
| <ObjCopyName Condition="$(CppCompilerAndLinker.Contains('clang'))">llvm-objcopy</ObjCopyName> | ||
| <ObjCopyNameAlternative /> | ||
| <ObjCopyNameAlternative Condition="$(CppCompilerAndLinker.Contains('clang'))">objcopy</ObjCopyNameAlternative> | ||
| </PropertyGroup> | ||
|
|
||
| <Error Condition="'$(_WhereLinker)' != '0' and '$(_IsApplePlatform)' == 'true'" Text="Platform linker ('$(CppLinker)') not found in PATH. Try installing Xcode to resolve the problem." /> | ||
| <Error Condition="'$(_WhereLinker)' != '0' and '$(CppCompilerAndLinkerAlternative)' != ''" | ||
| Text="Platform linker ('$(CppLinker)' or '$(CppCompilerAndLinkerAlternative)') not found in PATH. Try installing appropriate package for $(CppLinker) or $(CppCompilerAndLinkerAlternative) to resolve the problem." /> | ||
| <Error Condition="'$(_WhereLinker)' != '0' and '$(CppCompilerAndLinkerAlternative)' == '' and '$(_IsApplePlatform)' != 'true'" | ||
| Text="Requested linker ('$(CppLinker)') not found in PATH." /> | ||
|
|
||
| <Exec Command="command -v "$(ObjCopyName)"" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsApplePlatform)' != 'true' and '$(StripSymbols)' == 'true'"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_WhereSymbolStripper" /> | ||
| </Exec> | ||
|
|
||
| <Exec Command="command -v "$(ObjCopyNameAlternative)"" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsApplePlatform)' != 'true' and '$(ObjCopyNameAlternative)' != '' and '$(StripSymbols)' == 'true'"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_WhereSymbolStripperAlt" /> | ||
| </Exec> | ||
|
|
||
|
|
@@ -201,16 +204,16 @@ The .NET Foundation licenses this file to you under the MIT license. | |
|
|
||
| <Error Condition="'$(_WhereSymbolStripper)' != '0' and '$(StripSymbols)' == 'true' and '$(ObjCopyNameAlternative)' != ''" | ||
| Text="Symbol stripping tool ('$(ObjCopyName)' or '$(ObjCopyNameAlternative)') not found in PATH. Try installing appropriate package for $(ObjCopyName) or $(ObjCopyNameAlternative) to resolve the problem." /> | ||
| <Error Condition="'$(_WhereSymbolStripper)' != '0' and '$(StripSymbols)' == 'true' and '$(_IsApplePlatform)' != 'true'" | ||
| Text="Symbol stripping tool ('$(ObjCopyName)') not found in PATH. Make sure '$(ObjCopyName)' is available in PATH" /> | ||
|
|
||
| <Exec Command="command -v dsymutil && command -v strip" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsApplePlatform)' == 'true' and '$(StripSymbols)' == 'true'"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_WhereSymbolStripper" /> | ||
| </Exec> | ||
| <Error Condition="'$(_WhereSymbolStripper)' != '0' and '$(StripSymbols)' == 'true' and '$(_IsApplePlatform)' != 'true'" | ||
| Text="Symbol stripping tools ('dsymutil' and 'strip') not found in PATH. Make sure 'dsymutil' and 'strip' are available in PATH" /> | ||
|
|
||
| <Exec Command="dsymutil --help" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsApplePlatform)' == 'true' and '$(StripSymbols)' == 'true'"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_DsymUtilOutput" /> | ||
| </Exec> | ||
|
|
||
|
|
@@ -220,7 +223,7 @@ The .NET Foundation licenses this file to you under the MIT license. | |
| <Exec Command="CC="$(CppLinker)" "$(IlcHostPackagePath)/native/src/libs/build-local.sh" "$(IlcHostPackagePath)/" "$(IntermediateOutputPath)" System.Security.Cryptography.Native" | ||
| Condition="'$(StaticOpenSslLinking)' == 'true'" /> | ||
|
|
||
| <PropertyGroup Condition="'$(_IsApplePlatform)' == 'true' and '$(StripSymbols)' == 'true' and $(_DsymUtilOutput.Contains('--minimize'))"> | ||
| <DsymUtilOptions>$(DsymUtilOptions) --minimize</DsymUtilOptions> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.