diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-04-10 02:04:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 17:04:20 -0700 |
| commit | 0edffcf125ad2feca36dbfe17fc32bc824d07ca4 (patch) | |
| tree | 248a947543b86bc0e5fbfe65139aa6d6f2afa4a5 /toolsrc/include | |
| parent | bf858077f29c54fecb053ac9843d37892279b770 (diff) | |
| download | vcpkg-0edffcf125ad2feca36dbfe17fc32bc824d07ca4.tar.gz vcpkg-0edffcf125ad2feca36dbfe17fc32bc824d07ca4.zip | |
[vcpkg] New policy: SKIP_ARCHITECTURE_CHECK. (#10398)
* New policy: SKIP_DLL_ARCHITECTURE_CHECK.
The check only works if MS link.exe is used
otherwise the second linker member is missing
(according to the observed errors)
* rename to VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK
since the dll check was ok but the lib check was failing.
* fix indentation
* move the if to a better position.
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 892fb2370..d8e87f131 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -222,6 +222,7 @@ namespace vcpkg::Build ALLOW_OBSOLETE_MSVCRT, ALLOW_RESTRICTED_HEADERS, SKIP_DUMPBIN_CHECKS, + SKIP_ARCHITECTURE_CHECK, // Must be last COUNT, }; @@ -235,6 +236,7 @@ namespace vcpkg::Build BuildPolicy::ALLOW_OBSOLETE_MSVCRT, BuildPolicy::ALLOW_RESTRICTED_HEADERS, BuildPolicy::SKIP_DUMPBIN_CHECKS, + BuildPolicy::SKIP_ARCHITECTURE_CHECK }; const std::string& to_string(BuildPolicy policy); |