Propagate arch parameter to vcvars in msbuild helper #6928
Conversation
| @@ -83,7 +83,7 @@ def build(self, project_file, targets=None, upgrade_project=True, build_type=Non | |||
| props_file_contents = self._get_props_file_contents(definitions) | |||
| property_file_name = os.path.abspath(property_file_name) | |||
| save(property_file_name, props_file_contents) | |||
| vcvars = vcvars_command(self._conanfile.settings, force=force_vcvars, | |||
| vcvars = vcvars_command(self._conanfile.settings, arch=arch, force=force_vcvars, | |||
There was a problem hiding this comment.
Are we sure this is not breaking? So far the arch argument was used to define just the MSBuild command:
p:Platform=Release|x86
But the vcvars context could be using the toolchain of 64 bits, just that it can "cross build" to 32 bits if we want to.
Just a question, to double check.
There was a problem hiding this comment.
I wanted to try this just so see if there is any failing test in our test suite. If it is considered breaking, we can add a new attribute vccars_arch to allow the override
There was a problem hiding this comment.
there are four (at least) versions of vcvars:
06-Apr-20 15:20 2,151 x64 Native Tools Command Prompt for VS 2019.lnk
06-Apr-20 15:20 2,209 x64_x86 Cross Tools Command Prompt for VS 2019.lnk
06-Apr-20 15:20 2,151 x86 Native Tools Command Prompt for VS 2019.lnk
06-Apr-20 15:20 2,209 x86_x64 Cross Tools Command Prompt for VS 2019.lnk
the arch parameter of vcvars_command controls the target architecture. in other words, you may select between x64 native or x64_x86 cross tools.
therefore, specifying arch=x86 you probably want 32-bit binaries as result (implies x64_x86 Cross Tools), and specifying arch=x86_64 you want 64-bit binaries (implies x64 Native Tools).
and I believe it should be aligned with the platform for msbuild:
- arch=x86 ->
p:Platform=Release|x86(x64_x86 Cross Tools) - arch=x86_64 ->
p:Platform=Release|x64(x64 Native Tools)
and similar results running 32-bit Windows (which is unlikely these days):
- arch=x86 ->
p:Platform=Release|x86(x86 Native Tools) - arch=x86_64 ->
p:Platform=Release|x64(x86_x64 Cross Tools)
otherwise, you'll probably get compiler/linker errors.
I believe that should be the behavior, and MSBuild tests should reflect that.
There was a problem hiding this comment.
Updated changelog with "bugfix"
There was a problem hiding this comment.
Can you please @danimtb add some test that capture this behavior? We are changing something that doesn't affect our tests at all.
| @@ -83,7 +83,7 @@ def build(self, project_file, targets=None, upgrade_project=True, build_type=Non | |||
| props_file_contents = self._get_props_file_contents(definitions) | |||
| property_file_name = os.path.abspath(property_file_name) | |||
| save(property_file_name, props_file_contents) | |||
| vcvars = vcvars_command(self._conanfile.settings, force=force_vcvars, | |||
| vcvars = vcvars_command(self._conanfile.settings, arch=arch, force=force_vcvars, | |||
There was a problem hiding this comment.
Can you please @danimtb add some test that capture this behavior? We are changing something that doesn't affect our tests at all.
Changelog: BugFix: Propagate arch parameter to
tools.vcvars_command()inMSBuild()build helper.Docs: omit
#TAGS: slow
developbranch, documenting this one.Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.