Fix build break in internal build

[tfs-changeset: 1554810]

diff --git a/clr.props b/clr.props
index ae23d62..707d1cc 100644 (file)
--- a/clr.props
+++ b/clr.props
@@ -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>