Skip to content

[tools] Fix bindir for arm64 cppia #1323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Simn merged 2 commits into from
Mar 15, 2026
Merged

[tools] Fix bindir for arm64 cppia #1323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dc606f
[tools] Fix cppia bindir for arm64
tobil4sk Mar 15, 2026
bba19f0
[tools] Fix BINDIR for arm64 linux
tobil4sk Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions tools/hxcpp/BuildTool.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,15 +1632,16 @@ class BuildTool

if (args.length>0 && args[0].endsWith(".cppia"))
{
var binDir = isWindows ? "Windows" : isMac ? "Mac64" : isLinux ? "Linux64" : null;
if (binDir==null)
var hostName = isWindows ? "Windows" : isMac ? "Mac" : isLinux ? "Linux" : null;
if (hostName==null)
Log.error("Cppia is not supported on this host.");
var arch = getArch();
var binDir = isWindows ? (isWindowsArm ? "WindowsArm64" : "Windows64" ) :
isMac ? "Mac64" :
isLinux ? ("Linux64") :
null;
var exe = '$HXCPP/bin/$binDir/Cppia' + (isWindows ? ".exe" : "");
var archSuffix = switch getArch() {
case 'arm64': 'Arm64';
case 'm64': '64';
case 'm32': '';
case _: return Log.error("Unsupported host architecture");
};
var exe = '$HXCPP/bin/$hostName$archSuffix/Cppia' + (isWindows ? ".exe" : "");
if (!isWindows)
{
var phase = "find";
Expand Down Expand Up @@ -2140,7 +2141,7 @@ class BuildTool
defines.set("HXCPP_ARM64","1");
m64 = true;
}
defines.set("BINDIR", m64 ? "Linux64":"Linux");
defines.set("BINDIR", arm64 ? "LinuxArm64" : m64 ? "Linux64":"Linux");
}
}
else if ( (new EReg("mac","i")).match(os) )
Expand All @@ -2153,7 +2154,7 @@ class BuildTool
defines.set("linux","linux");
defines.set("toolchain","linux");
defines.set("xcompile","1");
defines.set("BINDIR", m64 ? "Linux64":"Linux");
defines.set("BINDIR", arm64 ? "LinuxArm64" : m64 ? "Linux64":"Linux");
}
else
{
Expand Down
Loading