diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-23 01:30:43 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-23 01:30:43 -0700 |
| commit | ee0201cfae196c175d58064b2e62a91c033ec038 (patch) | |
| tree | 76690e3d383237ee50247c9b56c8908d7148f62f /toolsrc/src/commands_install.cpp | |
| parent | e48fdb66a5be01321e68b371c6c171ed0fec3054 (diff) | |
| download | vcpkg-ee0201cfae196c175d58064b2e62a91c033ec038.tar.gz vcpkg-ee0201cfae196c175d58064b2e62a91c033ec038.zip | |
[vcpkg-build] Fix regression in build command.
Missing dependencies were not being computed correctly after the internal call to build failed. Solution is to return the already-computed list from build.
Diffstat (limited to 'toolsrc/src/commands_install.cpp')
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index dc1a69167..d1d9cec5f 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -317,15 +317,15 @@ namespace vcpkg::Commands::Install case InstallPlanType::BUILD_AND_INSTALL: { System::println("Building package %s... ", display_name); - const Build::BuildResult result = Commands::Build::build_package( + const auto result = Commands::Build::build_package( action.any_paragraph.source_paragraph.value_or_exit(VCPKG_LINE_INFO), action.spec, paths, paths.port_dir(action.spec), status_db); - if (result != Build::BuildResult::SUCCEEDED) + if (result.code != Build::BuildResult::SUCCEEDED) { - System::println(System::Color::error, Build::create_error_message(result, action.spec)); + System::println(System::Color::error, Build::create_error_message(result.code, action.spec)); System::println(Build::create_user_troubleshooting_message(action.spec)); Checks::exit_fail(VCPKG_LINE_INFO); } |