aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2023-11-07 17:57:09 +0100
committerCristian Adam <cristian.adam@qt.io>2023-11-15 13:47:46 +0000
commit3939ba93af8c6cc0dbd55cdb23a7c4c48539ac2a (patch)
tree47a98ac8c8cc881ecde48576c54fc50a812c9d9d /scripts
parentf9e2942a80035f044916bd1ce3270381b5a438a3 (diff)
qtcreatorcdbext: Deploy lldb on Windows
Starting with LLVM 17.0.1 we include lldb in the list of packages compiled on Windows. This commit deploys lldb.exe and its Python required machinery. Fixes: QTCREATORBUG-14539 Change-Id: I7f44c537cbaf31bf2f065762bdc9a48dd5efc64d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build.py b/scripts/build.py
index 72c7d3571a..6cd795a744 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -245,7 +245,10 @@ def build_qtcreatorcdbext(args, paths):
return
if not os.path.exists(paths.qtcreatorcdbext_build):
os.makedirs(paths.qtcreatorcdbext_build)
- prefix_paths = [common.to_posix_path(os.path.abspath(fp)) for fp in args.prefix_paths]
+ prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths]
+ if paths.llvm:
+ prefix_paths += [paths.llvm]
+ prefix_paths = [common.to_posix_path(fp) for fp in prefix_paths]
cmake_args = ['-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
'-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.qtcreatorcdbext_install)]
cmake_args += common_cmake_arguments(args)