Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use default LLVM in Ubuntu build #46

Merged
merged 2 commits into from
Dec 3, 2023
Merged

Use default LLVM in Ubuntu build #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23fe3cd
Use default LLVM in Ubuntu build
kazarmy Dec 3, 2023
7cb3b80
Use gcc to compile
kazarmy Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,8 @@ jobs:
name: wheels
path: wheelhouse/*.whl

ubuntu-llvm-15:
ubuntu-default-llvm:
runs-on: ubuntu-22.04
env:
CC: clang-15
CXX: clang++-15

steps:
- name: Checkout rz-bindgen
Expand All @@ -66,7 +63,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt-get --assume-yes install cmake swig pkg-config clang-15 libclang-15-dev llvm-15 wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
- name: Install rizin
run: |
Expand Down
4 changes: 2 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target_sphinx = targets.contains('sphinx')
doxygen_path = get_option('doxygen_path')

if clang_path == ''
llvm_config = find_program('llvm-config-15', 'llvm-config', 'llvm-config-7', required: false)
llvm_config = find_program('llvm-config', 'llvm-config-7', required: false)
if llvm_config.found()
clang_path = run_command(llvm_config, '--libdir', check: true).stdout().strip()
elif build_machine.system() == 'darwin'
Expand All @@ -46,7 +46,7 @@ if rizin_include_path == ''
endif

if clang_args == ''
clang = find_program('clang-15', 'clang', 'clang-7', required: false)
clang = find_program('clang', 'clang-7', required: false)
if clang.found()
clang_args += ' -resource-dir='
clang_args += '"' + run_command(clang, '-print-resource-dir', check: true).stdout().strip() + '"'
Expand Down
Loading