diff options
| author | Tilka <tilkax@gmail.com> | 2022-07-31 16:33:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 16:33:29 +0200 |
| commit | 2c754db3abb699894db501a453218df37a74bada (patch) | |
| tree | 48a37955bd71be50b572e5379132b13a1a9982a9 /Source | |
| parent | 45f8ae6d51360a776aa6d96ed88396776c946ec3 (diff) | |
| parent | e85da16947e336aff5db3ee723fb69b1a3e20324 (diff) | |
Merge pull request #10912 from shuffle2/msbuild-arch
msbuild: set PreferredToolArchitecture based on host OS arch
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/VSProps/Configuration.Base.props | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/VSProps/Configuration.Base.props b/Source/VSProps/Configuration.Base.props index 11e0fd8411..d36fe43c89 100644 --- a/Source/VSProps/Configuration.Base.props +++ b/Source/VSProps/Configuration.Base.props @@ -3,7 +3,8 @@ <PropertyGroup Label="Configuration"> <PlatformToolset>v143</PlatformToolset> <CharacterSet>Unicode</CharacterSet> - <PreferredToolArchitecture>x64</PreferredToolArchitecture> + <PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='x64'">x64</PreferredToolArchitecture> + <PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='ARM64'">ARM64</PreferredToolArchitecture> <!-- To use ASAN, just uncomment this. For simplicity, you should run VS/windbg/etc (including the built executables themselves) after using vcvarsall or similar to setup environment, as ASAN needs access to libs and executables in the toolchain paths. |