diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-03 16:33:02 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 15:06:18 -0700 |
| commit | 7bdf189a921fdee47044e907a3ff48ce8c880fe2 (patch) | |
| tree | f9e5b253020e4134ad58562fccece9d7832c6df5 /toolsrc/src/commands_build.cpp | |
| parent | a66b066d4584d6b92d249d71b9348344efc78d5e (diff) | |
| download | vcpkg-7bdf189a921fdee47044e907a3ff48ce8c880fe2.tar.gz vcpkg-7bdf189a921fdee47044e907a3ff48ce8c880fe2.zip | |
Rework vcpkg's triplet environment reading
The triplet is "run" and vcpkg observes the environment.
Previously, the environment was deduced by the triplet's name
Diffstat (limited to 'toolsrc/src/commands_build.cpp')
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index fe84f4b13..ec6586fa3 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -3,14 +3,11 @@ #include "Paragraphs.h" #include "PostBuildLint.h" #include "StatusParagraphs.h" -#include "metrics.h" -#include "vcpkg_Chrono.h" #include "vcpkg_Commands.h" #include "vcpkg_Dependencies.h" #include "vcpkg_Enums.h" #include "vcpkg_Input.h" #include "vcpkg_System.h" -#include "vcpkg_Util.h" #include "vcpkglib.h" using vcpkg::Build::BuildResult; @@ -29,8 +26,9 @@ namespace vcpkg::Commands::BuildCommand { if (options.find(OPTION_CHECKS_ONLY) != options.end()) { + auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet()); auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec)); - const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, build_info); + const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info); Checks::check_exit(VCPKG_LINE_INFO, error_count == 0); Checks::exit_success(VCPKG_LINE_INFO); } |