Skip to content

BuildTool: Fix xcodebuild: error: SDK macosx26 cannot be located. #1260

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

Open
joshtynjala wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

BuildTool: Fix xcodebuild: error: SDK macosx26 cannot be located. #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion tools/hxcpp/BuildTool.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,7 +2205,13 @@ class BuildTool
var ver = extract_version.matched(1);
var split_best = best.split(".");
var split_ver = ver.split(".");
if (Std.parseFloat(split_ver[0]) > Std.parseFloat(split_best[0]) || Std.parseFloat(split_ver[1]) > Std.parseFloat(split_best[1]))
var major_ver = Std.parseFloat(split_ver[0]);
var minor_ver = Std.parseFloat(split_ver[1]);
var major_best = Std.parseFloat(split_best[0]);
var minor_best = Std.parseFloat(split_best[1]);
if (major_ver == major_best && Math.isNaN(minor_best))
best = ver;
else if (major_ver > major_best || minor_ver > minor_best)
Copy link
Member

@tobil4sk tobil4sk Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't these two branches here be combined?

Copy link
Contributor Author

@joshtynjala joshtynjala Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, yes, but it felt like too much complexity for a single if condition. Separating them made them feel easier to understand.

Copy link
Member

@tobil4sk tobil4sk Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't the logic be simpler if incomplete version numbers are just ignored altogether, since it will always lead to an invalid MACOSX_VER value?
.e.g

if (Math.isNan(major_ver) || Math.isNan(minor_ver))
   continue;

Also it seems the second condition would be more correct if it was major_ver > major_best || (major_ver == major_best && minor_ver > minor_best).

Copy link
Contributor Author

@joshtynjala joshtynjala Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, that makes sense to me. I think maybe I was trying to support MacOSX26.sdk as a valid fallback if there's some strange situation where MacOSX26.0.sdk didn't exist. However, maybe that wouldn't ever happen.

best = ver;
}
}
Expand Down
Loading