Skip to content
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.

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

Enable macOS arm64 builds in CI #1520

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Enable macOS arm64 builds in CI #1520

merged 2 commits into from
Nov 8, 2023

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented Nov 3, 2023

This requires using the host platform's Python interpreter rather than the target platform's interpreter, which runs as part of the build process for resource.dat generation.

Also have to disable running tests when cross-compiling because the host system can't run the test executables compiled for the target system.

@@ -59,7 +59,7 @@ if(_PythonFinder_WantLibs)
find_program(
@PythonFinder_PREFIX@_EXECUTABLE
NAMES "python" "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@"
PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3"
PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools/python3"
Copy link
Member

Choose a reason for hiding this comment

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

Actually, now that I'm thinking about it... We need to bump the port-version in vcpkg.json to ensure that this gets deployed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch! Pushed a fix

@Hoikas Hoikas merged commit 4247e4b into H-uru:master Nov 8, 2023
17 checks passed
@dpogue dpogue deleted the host-python2 branch November 13, 2023 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants