diff options
| author | Sergey Andreenko <seandree@microsoft.com> | 2020-11-24 05:32:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 05:32:24 +0300 |
| commit | 89383aaf822ff7bd456551f2f67108a5cca76e98 (patch) | |
| tree | 63e26d424bef11220b6ef01cf1c1605b440baac2 /src/coreclr/crossgen-corelib.proj | |
| parent | 3f8966546a09ec104ca958eab20a22463907fed1 (diff) | |
Fix native build on arm and arm64. (#45131)
* Fix native build on arm and arm64.
* Fix a typo.
Diffstat (limited to 'src/coreclr/crossgen-corelib.proj')
| -rw-r--r-- | src/coreclr/crossgen-corelib.proj | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 6144cbfaf08..f4ff62f016f 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -20,12 +20,18 @@ <CoreLibAssemblyName>System.Private.CoreLib</CoreLibAssemblyName> <CoreLibInputPath>$(BinDir)\IL\$(CoreLibAssemblyName).dll</CoreLibInputPath> <CoreLibOutputPath>$(BinDir)\$(CoreLibAssemblyName).dll</CoreLibOutputPath> + </PropertyGroup> + <PropertyGroup> <CrossDir></CrossDir> + </PropertyGroup> + <PropertyGroup Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'"> <CrossDir Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'">x64</CrossDir> <CrossDir Condition="'$(TargetArchitecture)' == 'arm' and '$(UseCrossgen2)' != 'true' and '$(OS)' == 'Windows_NT'">x86</CrossDir> - <CrossDir Condition="'$(TargetArchitecture)' == 'x86' and '$(BuildArchitecture)' != '$(TargetArchitecture)' and '$(UseCrossgen2)' == 'true'">$(BuildArchitecture)</CrossDir> + <CrossDir Condition="'$(TargetArchitecture)' == 'x86' and '$(UseCrossgen2)' == 'true'">$(BuildArchitecture)</CrossDir> + </PropertyGroup> + <PropertyGroup> <BuildDll>true</BuildDll> <BuildDll Condition="'$(CrossBuild)' == 'true' and '$(CrossDir)' == ''">false</BuildDll> |