5 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 1e8b3b9df..471485e31 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -22,7 +22,7 @@ namespace vcpkg::Commands
         };
 
         const std::string& to_string(const BuildResult build_result);
-        std::string create_error_message(const BuildResult build_result, const std::string& package_id);
+        std::string create_error_message(const BuildResult build_result, const package_spec& spec);
         std::string create_user_troubleshooting_message(const package_spec& spec);
 
         BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index 750350a4a..264f9c06e 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -95,9 +95,9 @@ namespace vcpkg::Commands::Build
         }
     }
 
-    std::string create_error_message(const BuildResult build_result, const std::string& package_id)
+    std::string create_error_message(const BuildResult build_result, const package_spec& spec)
     {
-        return Strings::format("Error: Building package %s failed with: %s", package_id, Build::to_string(build_result));
+        return Strings::format("Error: Building package %s failed with: %s", spec.toString(), Build::to_string(build_result));
     }
 
     std::string create_user_troubleshooting_message(const package_spec& spec)
@@ -167,7 +167,7 @@ namespace vcpkg::Commands::Build
 
         if (result != BuildResult::SUCCEEDED)
         {
-            System::println(System::color::error, Build::create_error_message(result, spec.toString()));
+            System::println(System::color::error, Build::create_error_message(result, spec));
             System::println(Build::create_user_troubleshooting_message(spec));
             exit(EXIT_FAILURE);
         }
diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp
index fbda74f3f..0b4010310 100644
--- a/toolsrc/src/commands_build_external.cpp
+++ b/toolsrc/src/commands_build_external.cpp
@@ -26,7 +26,7 @@ namespace vcpkg::Commands::BuildExternal
                 const Build::BuildResult result = Commands::Build::build_package(*spgh, *spec, paths, port_dir, status_db);
                 if (result != Build::BuildResult::SUCCEEDED)
                 {
-                    System::println(System::color::error, Build::create_error_message(result, spec->toString()));
+                    System::println(System::color::error, Build::create_error_message(result, *spec));
                     System::println(Build::create_user_troubleshooting_message(*spec));
                     exit(EXIT_FAILURE);
                 }
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp
index d6239b080..dd42335df 100644
--- a/toolsrc/src/commands_ci.cpp
+++ b/toolsrc/src/commands_ci.cpp
@@ -58,7 +58,7 @@ namespace vcpkg::Commands::CI
                     results.push_back(result);
                     if (result != Build::BuildResult::SUCCEEDED)
                     {
-                        System::println(System::color::error, Build::create_error_message(result, action.spec.toString()));
+                        System::println(System::color::error, Build::create_error_message(result, action.spec));
                         continue;
                     }
                     const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index af068a4fb..d4ec64e09 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -217,7 +217,7 @@ namespace vcpkg::Commands::Install
                     const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), status_db);
                     if (result != Build::BuildResult::SUCCEEDED)
                     {
-                        System::println(System::color::error, Build::create_error_message(result, action.spec.toString()));
+                        System::println(System::color::error, Build::create_error_message(result, action.spec));
                         System::println(Build::create_user_troubleshooting_message(action.spec));
                         exit(EXIT_FAILURE);
                     }