diff options
Diffstat (limited to 'toolsrc/src/vcpkg/build.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index f163ef314..a0ff09327 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -871,6 +871,7 @@ namespace vcpkg::Build abi_tag_entries.emplace_back("features", Strings::join(";", sorted_feature_list)); if (action.build_options.use_head_version == UseHeadVersion::YES) abi_tag_entries.emplace_back("head", ""); + if (action.build_options.editable == Editable::YES) abi_tag_entries.emplace_back("editable", ""); Util::sort(abi_tag_entries); @@ -1019,7 +1020,7 @@ namespace vcpkg::Build std::error_code ec; const fs::path abi_package_dir = paths.package_dir(spec) / "share" / spec.name(); const fs::path abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt"; - if (action.build_options.editable == Build::Editable::NO) + if (action.has_package_abi()) { auto restore = binaries_provider.try_restore(paths, action); if (restore == RestoreResult::build_failed) @@ -1044,7 +1045,7 @@ namespace vcpkg::Build fs.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec); Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", fs::u8string(abi_file_in_package)); - if (action.build_options.editable == Build::Editable::NO && result.code == BuildResult::SUCCEEDED) + if (action.has_package_abi() && result.code == BuildResult::SUCCEEDED) { binaries_provider.push_success(paths, action); } @@ -1089,7 +1090,7 @@ namespace vcpkg::Build #if defined(_WIN32) auto vcpkg_update_cmd = ".\\vcpkg"; #else - auto vcpkg_update_cmd = ".\/vcpkg"; + auto vcpkg_update_cmd = "./vcpkg"; #endif return Strings::format("Please ensure you're using the latest portfiles with `%s update`, then\n" "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n" |