From b2544fd780b2e9a05d903314cbbd37268ba43d81 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Sat, 5 Jun 2021 09:45:39 -0700 Subject: [vcpkg_download_distfile] fix download while in manifest mode (#18283) When vcpkg detects a manifest root, it attempts to take a filesystem lock; this is a bug in `x-download`. We fix this bug by disabling manifests. --- scripts/cmake/vcpkg_download_distfile.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 5af4345ba..dd5108f92 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -202,7 +202,13 @@ function(vcpkg_download_distfile VAR) endforeach() endif() vcpkg_execute_in_download_mode( - COMMAND "$ENV{VCPKG_COMMAND}" x-download "${downloaded_file_path}" "${vcpkg_download_distfile_SHA512}" ${urls} ${request_headers} --debug + COMMAND "$ENV{VCPKG_COMMAND}" x-download + "${downloaded_file_path}" + "${vcpkg_download_distfile_SHA512}" + ${urls} + ${request_headers} + --debug + --feature-flags=-manifests # there's a bug in vcpkg x-download when it finds a manifest-root OUTPUT_VARIABLE output ERROR_VARIABLE output RESULT_VARIABLE failure -- cgit v1.2.3