From 5902f8f298ab74172f9956d8f61abd2408d3a620 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 9 Mar 2022 11:59:27 +0100 Subject: Qt Creator: Fix location of optimized llvm vs output directory Change-Id: If5b5a628d1d387dcd10a0ec53d2a8b62b080e5df Reviewed-by: Cristian Adam --- packaging-tools/build_wrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index aacf3a4fd..9c62207a2 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -1022,7 +1022,7 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): if use_optimized_libclang: opt_clang_url = (pkg_base_path + '/' + optionDict['CLANG_FILEBASE'] + '-windows-mingw_64' + clang_suffix + '.7z') opt_clang_path = os.path.join(download_temp, 'opt_libclang') - opt_clang_to_copy = [os.path.join('libclang', 'bin', file) for file + opt_clang_to_copy = [os.path.join('bin', file) for file in ['libclang.dll', 'clangd.exe', 'clang-tidy.exe']] add_download_extract(opt_clang_url, opt_clang_path) @@ -1058,7 +1058,7 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): # copy optimized clang package if use_optimized_libclang: for file in opt_clang_to_copy: - source = os.path.join(opt_clang_path, file) + source = os.path.join(opt_clang_path, 'libclang', file) target = os.path.join(llvm_install_dir, file) shutil.copyfile(source, target) -- cgit v1.2.3