Skip to content

Commit

Permalink
Merge pull request #46 from rizinorg/ubuntu-default-llvm
Browse files Browse the repository at this point in the history
Use default LLVM in Ubuntu build
  • Loading branch information
wargio authored Dec 3, 2023
2 parents 98ec554 + 7cb3b80 commit 1afe440
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
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
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

0 comments on commit 1afe440

Please sign in to comment.