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

fixes None-None toolset referenced by b2 generator #5810

Merged
merged 1 commit into from Oct 10, 2019

Conversation

@grisumbras
Copy link
Contributor

grisumbras commented Sep 25, 2019

Consuming project might not have compiler in its settings. In such case
b2 generator creates files that put None-None toolset into usage
requirements of dependencies, which leads to build error, as such
toolset does not exist. This commit fixes that error.

Changelog: Fix: Add support for recipes without settings.compiler in b2 generator.
Docs: Omit

Fix #5809

  • Refer to the issue that supports this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.
@CLAassistant

This comment has been minimized.

Copy link

CLAassistant commented Sep 25, 2019

CLA assistant check
All committers have signed the CLA.

@grisumbras grisumbras force-pushed the grisumbras:b2-fix-none-toolset branch from 4a288be to 613a0f5 Sep 25, 2019
conans/client/generators/b2.py Outdated Show resolved Hide resolved
@lasote

This comment has been minimized.

Copy link
Contributor

lasote commented Sep 25, 2019

@grafikrobot Could you review? :) Thanks

Consuming project might not have compiler in its settings. In such case
b2 generator creates files that put None-None toolset into usage
requirements of dependencies, which leads to build error, as such
toolset does not exist. This commit fixes that error.
@grisumbras grisumbras force-pushed the grisumbras:b2-fix-none-toolset branch from 613a0f5 to 732a4bd Sep 25, 2019
@grafikrobot

This comment has been minimized.

Copy link
Contributor

grafikrobot commented Sep 29, 2019

LGTM (sorry for the delay)

@danimtb danimtb added this to the 1.20 milestone Oct 4, 2019
@lasote

This comment has been minimized.

Copy link
Contributor

lasote commented Oct 7, 2019

No problem, the next release will take a while. Many thanks!

@lasote lasote merged commit 0503a0c into conan-io:develop Oct 10, 2019
2 checks passed
2 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.