diff options
| author | Thad House <ThadHouse@users.noreply.github.com> | 2021-03-02 15:54:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 15:54:00 +0300 |
| commit | fe1efb93169f299eef35a804447590943ff211a9 (patch) | |
| tree | 8417f01dac7e52d7264d383a349c829fb34f2bf7 /src/coreclr/crossgen-corelib.proj | |
| parent | 94e163a9d2de7dbb776f7efa628c0d2df87cd4eb (diff) | |
Fix Armel crossgen failing during pack (#45058)
Armel was not treated like arm or arm64, causing the wrong folders to be used during crossgen
Diffstat (limited to 'src/coreclr/crossgen-corelib.proj')
| -rw-r--r-- | src/coreclr/crossgen-corelib.proj | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 5de60badfa3..8687641d086 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -24,7 +24,7 @@ <CrossDir></CrossDir> </PropertyGroup> <PropertyGroup Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'"> - <CrossDir Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'">x64</CrossDir> + <CrossDir Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel'">x64</CrossDir> <CrossDir Condition="'$(TargetArchitecture)' == 'arm' and '$(UseCrossgen2)' != 'true' and '$(OS)' == 'Windows_NT'">x86</CrossDir> <CrossDir Condition="'$(TargetArchitecture)' == 'x86' and '$(UseCrossgen2)' == 'true'">$(BuildArchitecture)</CrossDir> </PropertyGroup> @@ -95,7 +95,9 @@ <CrossGenPerfMapCmd>$(CrossGen1Cmd) /CreatePerfMap "$(BinDir)"</CrossGenPerfMapCmd> <CrossGenPerfMapCmd>$(CrossGenPerfMapCmd) "$(CoreLibOutputPath)"</CrossGenPerfMapCmd> + </PropertyGroup> + <PropertyGroup Condition="$(BuildPdb) and '$(UseCrossgen2)' != 'true'"> <CrossGenPdbCmd>$(VsSetupCmd) $(CrossGen1Cmd) /CreatePdb "$([MSBuild]::NormalizePath('$(BinDir)', 'PDB'))"</CrossGenPdbCmd> <CrossGenPdbCmd>$(CrossGenPdbCmd) "$(CoreLibOutputPath)"</CrossGenPdbCmd> </PropertyGroup> |