Skip to content

Commit 1949af0

Browse files
authored
Exclude --gcc-toolchain from cross arg (#115163)
* Exclude --gcc-toolchain from cross arg * Update NativeExports.csproj
1 parent 043d49e commit 1949af0

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

eng/toolAot.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<PackageReference Include="runtime.$(NETCoreSdkRuntimeIdentifier).Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
2323
</ItemGroup>
2424

25-
<ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
26-
<CustomLinkerArg Condition="'$(CrossBuild)' == 'true' and '$(_hostArchitecture)' == '$(_targetArchitecture)' and '$(_hostOS)' != 'windows'" Include="--gcc-toolchain=$(ROOTFS_DIR)/usr" />
27-
</ItemGroup>
28-
2925
<Target Name="LocateNativeCompiler"
3026
Condition="'$(UseNativeAotForComponents)' == 'true' and '$(HostOS)' != 'windows'"
3127
BeforeTargets="SetupOSSpecificProps">

src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</XmlPeek>
8888

8989
<PropertyGroup>
90-
<CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
90+
<CommonToolchainArgs>--target=$(TargetTriple) --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
9191
<DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
9292
<DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
9393
</PropertyGroup>

0 commit comments

Comments
 (0)