[vcpkg] vcpkg_configure_meson: Support macOS cross-compile#15867
[vcpkg] vcpkg_configure_meson: Support macOS cross-compile#15867ras0219-msft merged 3 commits intomicrosoft:masterfrom
Conversation
|
cc @Neumann-A for review this PR. |
59b81f6 to
d46506b
Compare
|
Rebased on top of the latest |
|
@ras0219-msft @JackBoosY Just for clarity, I would like to encourage the merging of this PR as-is. (Additional port fixes will depend on #15424, but I feel that those are out-of-scope for this PR and best left for a subsequent PR.) This small change fixes a number of ports ( |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@JackBoosY |
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
7114eef to
03d6415
Compare
|
All seems to check out with the new regex, and I'm pretty happy with that as the solution. (It fixes many other issues as well with splitting |
|
LGTM, this is a clear improvement over the status quo. I'm sure there will be some additional edge cases found in the future, but I don't think that is worth holding up the improvement now. |
Describe the pull request
NOTE: Depends on #15659
(the first 3 commits in this PR are from #15659, for running CI)- now merged!Based on discussion on Discord with @ras0219, this takes the approach of a minimal fix to the meson cross-compile config.
While this fixes cross-compiling many meson-based ports, there is one exception:
Meson-based ports that require "native" architecture tools to be built as part of their build process may still have issues. But as @ras0219 noted (on Discord), that is best fixed by port-level fixes after PR #15424 is merged that take advantage of that new "host triplet dependency" functionality. Regardless, this fix is needed for the rest.
Fixes
arm64-osxcross-compile of meson-based ports.(Building meson-based ports for
arm64-osxwould previously build them for the native architecture - i.e. buildingharfbuzz:arm64-osxon an Intel 64-bit Mac, would seemingly succeed but actually build anx86_64architecture library.)arm64-osx