From e76454b3c6a22b65eecf67b4d40ade723e9e5e80 Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Sun, 6 Apr 2025 20:05:37 +0300 Subject: [PATCH 1/2] fix: set MACOS_CMAKE_ARGS for diff clang versions --- .github/workflows/build.yml | 12 ++++++++++-- .gitignore | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0549bce..4f32e9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,14 +80,19 @@ jobs: runs-on: ${{ matrix.runner }} if: ${{ github.actor != 'dependabot[bot]' }} env: - COMMON_CMAKE_ARGS: '-DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"' + COMMON_CMAKE_ARGS: > + -DBUILD_SHARED_LIBS=OFF + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" MACOS_CMAKE_ARGS: > -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DZSTD_STATIC_LINKING_ONLY=1 -DLLVM_ENABLE_ASSERTIONS=OFF - LINUX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10' + LINUX_CMAKE_ARGS: > + -DCMAKE_BUILD_TYPE=MinSizeRel + -DCMAKE_CXX_COMPILER=g++-10 + -DCMAKE_C_COMPILER=gcc-10 RELEASE: '${{ matrix.release }}' suffix: '${{ matrix.clang-version }}_${{ matrix.os }}-amd64' steps: @@ -149,6 +154,9 @@ jobs: brew update brew upgrade brew cleanup + echo "Append DYLIB options..." + MACOS_CMAKE_ARGS="$MACOS_CMAKE_ARGS -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON" + echo "MACOS_CMAKE_ARGS=$MACOS_CMAKE_ARGS" >> $GITHUB_ENV - name: CMake run: cmake -S ${{ matrix.release }}/llvm -B ${{ matrix.release }}/build ${{ env.COMMON_CMAKE_ARGS }} ${{ matrix.os-cmake-args }} ${{ matrix.extra-cmake-args }} - name: Build diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a415184 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +venv +.venv From ecb8313f945b87206af443aa9e2850906372c76f Mon Sep 17 00:00:00 2001 From: shenxianpeng Date: Sun, 6 Apr 2025 20:07:51 +0300 Subject: [PATCH 2/2] fix: revert args format --- .github/workflows/build.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f32e9c..98ebe84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,19 +80,14 @@ jobs: runs-on: ${{ matrix.runner }} if: ${{ github.actor != 'dependabot[bot]' }} env: - COMMON_CMAKE_ARGS: > - -DBUILD_SHARED_LIBS=OFF - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" + COMMON_CMAKE_ARGS: '-DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"' MACOS_CMAKE_ARGS: > -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DZSTD_STATIC_LINKING_ONLY=1 -DLLVM_ENABLE_ASSERTIONS=OFF - LINUX_CMAKE_ARGS: > - -DCMAKE_BUILD_TYPE=MinSizeRel - -DCMAKE_CXX_COMPILER=g++-10 - -DCMAKE_C_COMPILER=gcc-10 + LINUX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10' RELEASE: '${{ matrix.release }}' suffix: '${{ matrix.clang-version }}_${{ matrix.os }}-amd64' steps: