From 23fe3cdf08064d6bdeeca90dfcf58737bfba84ac Mon Sep 17 00:00:00 2001 From: Khairul Azhar Kasmiran Date: Sun, 3 Dec 2023 10:27:18 +0800 Subject: [PATCH 1/2] Use default LLVM in Ubuntu build --- .github/workflows/ci.yml | 8 ++++---- meson.build | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 639ff9c..04b4390 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,11 +44,11 @@ jobs: name: wheels path: wheelhouse/*.whl - ubuntu-llvm-15: + ubuntu-default-llvm: runs-on: ubuntu-22.04 env: - CC: clang-15 - CXX: clang++-15 + CC: clang + CXX: clang++ steps: - name: Checkout rz-bindgen @@ -66,7 +66,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: | diff --git a/meson.build b/meson.build index f192ab3..65822ed 100644 --- a/meson.build +++ b/meson.build @@ -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' @@ -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() + '"' From 7cb3b801a14a0f5930f3a266e2a2342eb240f32e Mon Sep 17 00:00:00 2001 From: Khairul Azhar Kasmiran Date: Sun, 3 Dec 2023 10:54:06 +0800 Subject: [PATCH 2/2] Use gcc to compile --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04b4390..e59ff76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,9 +46,6 @@ jobs: ubuntu-default-llvm: runs-on: ubuntu-22.04 - env: - CC: clang - CXX: clang++ steps: - name: Checkout rz-bindgen