|
217 | 217 | <PropertyGroup>
|
218 | 218 | <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">/x86_arm</_crossDir>
|
219 | 219 | <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">/x64_arm</_crossDir>
|
220 |
| - <_crossDir Condition="'$(TargetArchitecture)' == 'arm64'">/x64_arm64</_crossDir> |
| 220 | + <!-- Only use x64_arm64 when cross compiling. Use normal executible when compiling on arm64 itself. --> |
| 221 | + <_crossDir Condition="'$(TargetArchitecture)' == 'arm64' AND '$(HostArch)' != 'Arm64'">/x64_arm64</_crossDir> |
221 | 222 | </PropertyGroup>
|
222 | 223 |
|
223 | 224 | <ItemGroup>
|
|
251 | 252 | </PropertyGroup>
|
252 | 253 |
|
253 | 254 | <PropertyGroup Condition="'@(_runtimeJIT)' != ''">
|
254 |
| - <_jitPath>%(_runtimeJIT.FullPath)</_jitPath> |
| 255 | + <_runtimeJITFilterDir>$([System.IO.Path]::DirectorySeparatorChar)$(PackageRID)$([System.IO.Path]::DirectorySeparatorChar)</_runtimeJITFilterDir> |
| 256 | + </PropertyGroup> |
| 257 | + |
| 258 | + <!-- It is possible for _runtimeJIT to pick up 2 jit files: |
| 259 | + one for cross compilation and one for native compilation. --> |
| 260 | + <ItemGroup Condition="'@(_runtimeJIT)' != '' AND '$(_crossDir)' == ''"> |
| 261 | + <_filteredRuntimeJIT Include="%(_runtimeJIT.Identity)" Condition="'@(_runtimeJIT->Contains($(_runtimeJITFilterDir)))' == 'True'" /> |
| 262 | + </ItemGroup> |
| 263 | + |
| 264 | + <PropertyGroup Condition="'@(_runtimeJIT)' != ''"> |
| 265 | + <_jitPath>%(_filteredRuntimeJIT.FullPath)</_jitPath> |
255 | 266 | <_jitPath Condition="'$(_crossDir)' != ''">$(_jitPackageDir)runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
|
256 | 267 | </PropertyGroup>
|
257 | 268 |
|
| 269 | + <Message Importance="high" Text="XXX ### *** === +++ This is PackageRID: $(PackageRID)"/> |
| 270 | + <Message Importance="high" Text="XXX ### *** === +++ This is _runtimeJIT: @(_runtimeJIT)"/> |
| 271 | + <Message Importance="high" Text="XXX ### *** === +++ This is _runtimeJITFilterDir: $(_runtimeJITFilterDir)"/> |
| 272 | + <Message Importance="high" Text="XXX ### *** === +++ This is _filteredRuntimeJIT: @(_filteredRuntimeJIT)"/> |
| 273 | + <Message Importance="high" Text="XXX ### *** === +++ This is _jitPath: $(_jitPath)"/> |
| 274 | + |
258 | 275 | <PropertyGroup Condition="'@(_fxSystemRuntime)' != ''">
|
259 | 276 | <_fxLibDirectory>%(_fxSystemRuntime.RootDir)%(_fxSystemRuntime.Directory)</_fxLibDirectory>
|
260 | 277 | </PropertyGroup>
|
|
0 commit comments