Do not add host architecture if arm architecture is set (HaxeFoundation#1079)

tobil4sk · web-flow · commit 0ab4cf09239b · 2024-06-25T18:53:05.000+02:00
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
@@ -134,7 +134,8 @@ class BuildTool
       m64 = mDefines.exists("HXCPP_M64");
       m32 = mDefines.exists("HXCPP_M32");
       arm64 = mDefines.exists("HXCPP_ARM64");
-      if (m64==m32 && !arm64)
+      var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") || mDefines.exists("HXCPP_ARMV7") || mDefines.exists("HXCPP_ARMV7S");
+      if (m64==m32 && !arm64 && !otherArmArchitecture)
       {
          var arch = getArch();
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ class BuildTool`
`134`	`134`	`m64 = mDefines.exists("HXCPP_M64");`
`135`	`135`	`m32 = mDefines.exists("HXCPP_M32");`
`136`	`136`	`arm64 = mDefines.exists("HXCPP_ARM64");`
`137`		`- if (m64==m32 && !arm64)`
	`137`	`+ var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") \|\| mDefines.exists("HXCPP_ARMV7") \|\| mDefines.exists("HXCPP_ARMV7S");`
	`138`	`+ if (m64==m32 && !arm64 && !otherArmArchitecture)`
`138`	`139`	`{`
`139`	`140`	`var arch = getArch();`
`140`	`141`