@@ -262,28 +262,8 @@ def main(argv):
262262 _run (["pod" , "repo" , "update" ])
263263
264264 cmake_flags = _get_desktop_compiler_flags (FLAGS .compiler , config .compilers )
265- # VCPKG is used to install dependencies for the desktop SDK.
266- # Building from source requires building the underlying SDK libraries,
267- # so we need to use VCPKG as well.
268265 if _DESKTOP in platforms and not FLAGS .packaged_sdk :
269- vcpkg_arch = FLAGS .arch
270- installer = os .path .join (repo_dir , "scripts" , "gha" , "build_desktop.py" )
271- # --gha_build may be required to enable x86 Linux GitHub workarounds.
272- additional_flags = ["--gha_build" ] if FLAGS .gha_build else []
273- _run ([sys .executable , installer , "--vcpkg_step_only" , "--arch" , vcpkg_arch ]
274- + additional_flags )
275- toolchain_file = os .path .join (
276- repo_dir , "external" , "vcpkg" , "scripts" , "buildsystems" , "vcpkg.cmake" )
277- if utils .is_mac_os () and FLAGS .arch == "arm64" :
278- toolchain_file = os .path .join (
279- repo_dir , "external" , "vcpkg" , "scripts" , "buildsystems" , "macos_arm64.cmake" )
280- if utils .is_linux_os () and FLAGS .arch == "x86" :
281- toolchain_file = os .path .join (
282- repo_dir , "external" , "vcpkg" , "scripts" , "buildsystems" , "linux_32.cmake" )
283-
284266 cmake_flags .extend ((
285- "-DCMAKE_TOOLCHAIN_FILE=%s" % toolchain_file ,
286- "-DVCPKG_TARGET_TRIPLET=%s" % utils .get_vcpkg_triplet (arch = vcpkg_arch ),
287267 "-DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=%s" % sys .executable ,
288268 ))
289269
0 commit comments