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

Conan 1.x: Fix VCVars for Clang with v14.4 toolset #16932

Merged
merged 3 commits into from
Sep 5, 2024

Conversation

glebov-andrey
Copy link

@glebov-andrey glebov-andrey commented Sep 4, 2024

Changelog: Bugfix: Fix LLVM/Clang enablement of vcvars for latest v14.4 toolset version after VS 17.10 update
Docs: conan-io/docs#3830

Close #16930

Partially backports #16374. The tools.microsoft:msvc_update conf property is not present in Conan 1 so its usage is omitted.
This change should not break any existing users because it only adds code paths which run when the compiler.runtime_version setting is updated to v144, only for clang and only in the VCVars generator.

  • 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
Copy link

CLAassistant commented Sep 4, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

I think this should be very low risk, so no problem with merging this for next Conan 1.66

@memsharded
Copy link
Member

memsharded commented Sep 4, 2024

There is a test that is failing:

conans/test/integration/test_migrations.py::TestMigrations::test_migrations_matches_config

This test checks the migration is working fine.
To fix it is necessary to change the migration_settings.py final settings_1_66_0 = settings_1_65_0 and define
settings_1_66_0 = <full new settings yaml including the new values.

This is an inconvenient way of updating the settings.yml in Conan 1.X, fortunately this was improved in Conan 2 and such migrations are fully automatic.

@czoido
Copy link
Contributor

czoido commented Sep 5, 2024

There is a test that is failing:

conans/test/integration/test_migrations.py::TestMigrations::test_migrations_matches_config

This test checks the migration is working fine. To fix it is necessary to change the migration_settings.py final settings_1_66_0 = settings_1_65_0 and define settings_1_66_0 = <full new settings yaml including the new values.

This is an inconvenient way of updating the settings.yml in Conan 1.X, fortunately this was improved in Conan 2 and such migrations are fully automatic.

I have just fixed it, it should pass now

@czoido czoido merged commit 8a0bca6 into conan-io:develop Sep 5, 2024
2 checks passed
@glebov-andrey glebov-andrey deleted the fix/v1_vcvars_clang_v144 branch September 5, 2024 11:23
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.

4 participants