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

deps.windows: Fix architecture mismatch when building on ARM64 host #275

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

PatTheMav
Copy link
Member

@PatTheMav PatTheMav commented Jan 29, 2025

Description

Changes the DevShell arguments to explicitly include the host architecture whenever the x86 architecture needs to be built on GitHub Actions runners.

Motivation and Context

While working without issue on local machines, it seems to be that the build scripts cannot correctly invoke a DevShell and the detours nmake build system for the x86 architecture without explicitly specifying the host architecture.

The same workaround breaks building other architecture on actual ARM64 Windows machines, thus it is now limited to CI runs only.

How Has This Been Tested?

Tested locally in a Windows ARM64 VM, will be tested by CI for other architectures.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Looks fine.

@RytoEX RytoEX merged commit 14b180d into obsproject:master Jan 29, 2025
22 checks passed
@PatTheMav PatTheMav deleted the arm64-detours-fix branch February 3, 2025 16:24
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