mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:58:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Actually only override the PUBLIC ABI, not the private one

Browse Source
This commit is contained in:
Curtis.Bezault 2019-08-09 14:40:09 -07:00
parent 724055b4e2
commit ad82c38cc1
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/get_triplet_environment.cmake
View File

@ -13,4 +13,4 @@ message("VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}")
message("VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") message("VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
message("VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}") message("VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}")
message("VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH}") message("VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH}")
message("VCPKG_EXTERNAL_FILES=${VCPKG_EXTERNAL_FILES}") message("VCPKG_EXTERNAL_FILES=${VCPKG_PUBLIC_ABI_OVERRIDE}")

16
toolsrc/src/vcpkg/build.cpp
View File

@ -611,15 +611,6 @@ namespace vcpkg::Build
const PreBuildInfo& pre_build_info, const PreBuildInfo& pre_build_info,
Span<const AbiEntry> dependency_abis) Span<const AbiEntry> dependency_abis)
{ {
if (pre_build_info.public_abi_override)
{
return AbiTagAndFile
{
"override",
pre_build_info.public_abi_override.value_or_exit(VCPKG_LINE_INFO)
};
}
auto& fs = paths.get_filesystem(); auto& fs = paths.get_filesystem();
const Triplet& triplet = config.triplet; const Triplet& triplet = config.triplet;
const std::string& name = config.scf.core_paragraph->name; const std::string& name = config.scf.core_paragraph->name;
@ -823,7 +814,7 @@ namespace vcpkg::Build
paths, paths,
pre_build_info, pre_build_info,
spec, spec,
AbiTagAndFile{}.tag, pre_build_info.public_abi_override.value_or(AbiTagAndFile{}.tag),
config); config);
} }
@ -883,7 +874,7 @@ namespace vcpkg::Build
paths, paths,
pre_build_info, pre_build_info,
spec, spec,
maybe_abi_tag_and_file.value_or_exit(VCPKG_LINE_INFO).tag, pre_build_info.public_abi_override.value_or(abi_tag_and_file->tag),
config); config);
if (config.build_package_options.binary_caching == BinaryCaching::YES && if (config.build_package_options.binary_caching == BinaryCaching::YES &&
@ -1129,8 +1120,7 @@ namespace vcpkg::Build
pre_build_info.passthrough_env_vars = Strings::split(variable_value, ";"); pre_build_info.passthrough_env_vars = Strings::split(variable_value, ";");
break; break;
case VcpkgTripletVar::PUBLIC_ABI_OVERRIDE : case VcpkgTripletVar::PUBLIC_ABI_OVERRIDE :
pre_build_info.public_abi_override = pre_build_info.public_abi_override = variable_value;
variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
break; break;
} }
} }