aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-10-11 22:03:05 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-10-25 10:27:26 -0700
commit9c62c6a37ac940abbb4f19237d9a891881421a1a (patch)
treeb4ac6f212c1521eed32057886071fba300482c11 /toolsrc/src
parent949c038143ed8962ef0ca6d81221bb70ce96dd9c (diff)
downloadvcpkg-9c62c6a37ac940abbb4f19237d9a891881421a1a.tar.gz
vcpkg-9c62c6a37ac940abbb4f19237d9a891881421a1a.zip
Upgrades 2018.10.11
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/build.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 7569f340f..9b97701ef 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -468,18 +468,18 @@ namespace vcpkg::Build
const Triplet& triplet = config.triplet;
const std::string& name = config.scf.core_paragraph->name;
- std::vector<AbiEntry> abi_tag_entries;
+ std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
abi_tag_entries.emplace_back(AbiEntry {"cmake", paths.get_tool_version(Tools::CMAKE)});
- abi_tag_entries.insert(abi_tag_entries.end(), dependency_abis.begin(), dependency_abis.end());
-
abi_tag_entries.emplace_back(
AbiEntry {"portfile", vcpkg::Hash::get_file_hash(fs, config.port_dir / "portfile.cmake", "SHA1")});
abi_tag_entries.emplace_back(
AbiEntry {"control", vcpkg::Hash::get_file_hash(fs, config.port_dir / "CONTROL", "SHA1")});
- abi_tag_entries.emplace_back(AbiEntry {"triplet", pre_build_info.triplet_abi_tag});
+ abi_tag_entries.emplace_back(AbiEntry{"vcpkg_fixup_cmake_targets", "1"});
+
+ abi_tag_entries.emplace_back(AbiEntry{"triplet", pre_build_info.triplet_abi_tag});
const std::string features = Strings::join(";", config.feature_list);
abi_tag_entries.emplace_back(AbiEntry {"features", features});