From 126216d8437671ec1d092654984f5bc82bd7ead9 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 29 Jan 2025 23:26:29 -0500 Subject: [PATCH] [llvm] fix aarch64 cibuildwheel --- .github/workflows/build_test_release_eudsl.yml | 13 +++---------- projects/eudsl-llvmpy/pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_test_release_eudsl.yml b/.github/workflows/build_test_release_eudsl.yml index dbcd439..2de2750 100644 --- a/.github/workflows/build_test_release_eudsl.yml +++ b/.github/workflows/build_test_release_eudsl.yml @@ -152,17 +152,10 @@ jobs: if: ${{ ! startsWith(matrix.os, 'windows') }} run: | - if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then - if [[ "${{ matrix.os }}" == "ubuntu" ]]; then - export CCACHE_DIR=/host/$CCACHE_DIR - fi - $python3_command -m cibuildwheel "$PWD/projects/eudsl-llvmpy" --output-dir wheelhouse - else - export CMAKE_PREFIX_PATH=$PWD/llvm-install - export PIP_FIND_LINKS=$PWD/wheelhouse - $python3_command -m pip install eudsl-tblgen -f wheelhouse - $python3_command -m pip wheel "$PWD/projects/eudsl-llvmpy" -w wheelhouse -v --no-build-isolation + if [[ "${{ matrix.os }}" == "ubuntu" ]]; then + export CCACHE_DIR=/host/$CCACHE_DIR fi + $python3_command -m cibuildwheel "$PWD/projects/eudsl-llvmpy" --output-dir wheelhouse - name: "Build eudsl-nbgen" run: | diff --git a/projects/eudsl-llvmpy/pyproject.toml b/projects/eudsl-llvmpy/pyproject.toml index 37d80db..1d1fbc1 100644 --- a/projects/eudsl-llvmpy/pyproject.toml +++ b/projects/eudsl-llvmpy/pyproject.toml @@ -66,7 +66,7 @@ test-command = "ccache -sv" [tool.cibuildwheel.linux] before-all = [ - "yum install -y clang", + "yum install -y clang libarchive-devel antlr-tool libxml2-devel libxslt-devel libcurl-devel", # ccache "echo $(if [ \"$(arch)\" == \"x86_64\" ]; then curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz && tar -xf ccache-4.10.2-linux-x86_64.tar.xz && pushd ccache-4.10.2-linux-x86_64 && make install && popd; fi)", "echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",