Skip to content

Commit af3c35b

Browse files
authored
Merge pull request #628 from rust-lang/restore-llvm-fix
Restore LLVM fix
2 parents a1f9554 + bf2fd22 commit af3c35b

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
3+
# lldb 14 fails to load Python modules due to a wrong path. The workaround for
4+
# this issue is to symlink the modules to the path that lldb expects.
5+
# https://github.com/llvm/llvm-project/issues/55575
6+
#
7+
# This fix can be removed once we move to llvm 16
8+
9+
- name: Find all lldb Python files
10+
ansible.builtin.find:
11+
paths: /usr/lib/llvm-14/lib/python3.12/dist-packages/lldb
12+
file_type: file
13+
register: lldb_python_files
14+
15+
- name: Find all lldb Python modules
16+
ansible.builtin.find:
17+
paths: /usr/lib/llvm-14/lib/python3.12/dist-packages/lldb
18+
file_type: directory
19+
register: lldb_python_directories
20+
21+
- name: Fix llvm/llvm-project#55575
22+
ansible.builtin.file:
23+
src: "{{ item.path }}"
24+
dest: "/usr/lib/python3/dist-packages/lldb/{{ item.path | basename }}"
25+
state: link
26+
with_items: "{{ lldb_python_files.files + lldb_python_directories.files }}"
27+
28+
- name: Fix lldb-server-14.0.0
29+
ansible.builtin.file:
30+
src: /usr/lib/llvm-14/bin/lldb-server
31+
dest: /usr/bin/lldb-server-14.0.6
32+
state: link

ansible/roles/dev-desktop/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
- include_tasks: github.yml
1414
- include_tasks: motd.yml
1515
- include_tasks: scripts.yml
16-
- include_tasks: services.yml
16+
- include_tasks: fix_llvm_55575.yml

0 commit comments

Comments
 (0)