Skip to content

Commit d26ad8e

Browse files
authored
Use in-tree ilasm to run test suite natively on s390x (#71326)
* There are no linux-s390x packages on nuget.org, so use in-tree built ilasm when running the test suite natively on s390x
1 parent 9534947 commit d26ad8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
116116
<MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
117117
<TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
118-
<ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ILAsmToolPath>
118+
<ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true' or '$(BuildArchitecture)' == 's390x'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ILAsmToolPath>
119119
</PropertyGroup>
120120

121121
<PropertyGroup Label="CalculateConfiguration">

0 commit comments

Comments
 (0)