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

[boost-modular-builder] let fallback to default tool path #15254

Merged
merged 4 commits into from Dec 31, 2020

Conversation

xandox
Copy link
Contributor

@xandox xandox commented Dec 22, 2020

Let fallback to default boost build path.

This fix works for me now but I am not sure it is correct way to fix a problem.
I use vcpkg in manifest mode and try cross compile my project for android. I redefine VCPKG_TARGET_ARCHITECTURE and VCPKG_CMAKE_SYSTEM_NAME for boost-build port in overplayed triplet file, but any checks in this script assumes that you use vcpkg not in manifest mode. Maybe it's better to check here if we in manifest mode but there are not any cmake variable which can helps to detect this mode (VCPKG_MANIFEST_MODE not defined, VCPKG_MANIFEST_INSTALL is OFF).

  • What does your PR fix? Fixes #

  • Which triplets are supported/not supported? Have you updated the CI baseline?

  • Does your PR follow the maintainer guide?

@PhoebeHui PhoebeHui added the category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. label Dec 23, 2020
@PhoebeHui
Copy link
Contributor

@xandox, could you open an issue for this?

@xandox
Copy link
Contributor Author

xandox commented Dec 23, 2020

@PhoebeHui sure but for what concrete?

@PhoebeHui
Copy link
Contributor

@xandox, I'm also not sure if it's a correct fix, since it affects a community triplet, this is not usual scenario we're working on, but we accept the PRs for fixing the issue, I suggest to open an issue with details so others may replicate this problem.

BTW, what does the issue have to do with manifest? this is not be a problem if not in manifest mode?

@xandox
Copy link
Contributor Author

xandox commented Dec 24, 2020

Tried to explain everything in #15291

@PhoebeHui
Copy link
Contributor

@xandox, could you please resolve the conflicts?

@BillyONeal, could you help further review?

Copy link
Member

@vicroms vicroms left a comment

Choose a reason for hiding this comment

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

This looks OK to me.

# Conflicts:
#	ports/boost-modular-build-helper/CONTROL
@PhoebeHui PhoebeHui added info:reviewed Pull Request changes follow basic guidelines and removed requires:discussion labels Dec 31, 2020
@vicroms vicroms merged commit e83c76d into microsoft:master Dec 31, 2020
@xandox xandox deleted the boost_modular_builder_tool_detection branch January 12, 2021 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants