diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-12-05 08:36:04 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-05 08:36:04 -0800 |
| commit | d43282b799eb129c2ffdcb92087d73c111d159a8 (patch) | |
| tree | c66fc87efeb2f233c7b19a53afedb49c86de77fb /clr.props | |
| parent | 2f5e924bdd84f90b94be1236afeeb80f3c4fc5cf (diff) | |
| download | coreclr-d43282b799eb129c2ffdcb92087d73c111d159a8.tar.gz coreclr-d43282b799eb129c2ffdcb92087d73c111d159a8.tar.bz2 coreclr-d43282b799eb129c2ffdcb92087d73c111d159a8.zip | |
Fix build break in internal build
[tfs-changeset: 1554810]
Diffstat (limited to 'clr.props')
| -rw-r--r-- | clr.props | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -89,18 +89,20 @@ <AsmSuffix Condition="'$(BuildArchitecture)' == 'i386' or '$(BuildArchitecture)' == 'amd64'">asm</AsmSuffix> + <CDefines Condition="'$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm64'">$(CDefines);BIT64</CDefines> + <!-- Note: ClrProduct can be set prior to this file to 'Standalone'. --> <ClrProduct Condition="(('$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys')) and ('$(ClrProduct)' == '' or '$(CoreTarget)' == 'true')">core_clr</ClrProduct> <ClrProduct Condition="('$(BuildProjectName)' == '') and ('$(ClrProduct)' == '')">desktop_clr</ClrProduct> <ClAdditionalOptions>$(ClAdditionalOptions) /Zm200</ClAdditionalOptions> <TargetDefines Condition="'$(BuildArchitecture)'=='i386'">$(BuildArchitecture);_X86_</TargetDefines> - <TargetDefines Condition="'$(BuildArchitecture)'=='amd64'">$(BuildArchitecture);_AMD64_;BIT64</TargetDefines> + <TargetDefines Condition="'$(BuildArchitecture)'=='amd64'">$(BuildArchitecture);_AMD64_</TargetDefines> <TargetDefines Condition="'$(BuildArchitecture)'=='arm'">$(BuildArchitecture);_ARM_</TargetDefines> - <TargetDefines Condition="'$(BuildArchitecture)'=='arm64'">$(BuildArchitecture);_ARM64_;BIT64</TargetDefines> + <TargetDefines Condition="'$(BuildArchitecture)'=='arm64'">$(BuildArchitecture);_ARM64_</TargetDefines> - <TargetCpu Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'rotor_x86')">i386</TargetCpu> - <TargetCpu Condition="('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'rotor_amd64')">amd64</TargetCpu> + <TargetCpu Condition="('$(TargetArch)' == 'i386')">i386</TargetCpu> + <TargetCpu Condition="('$(TargetArch)' == 'amd64')">amd64</TargetCpu> <TargetCpu Condition="('$(TargetArch)' == 'arm')">arm</TargetCpu> <TargetCpu Condition="('$(TargetArch)' == 'arm64')">arm64</TargetCpu> |