Skip to content

Commit cf4acc2

Browse files
committed
update build.yml and add .gitignore
1 parent 1e10592 commit cf4acc2

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
dotexe: ''
6363
shacmd: 'sha512sum'
6464
- os: macosx
65-
runner: macos-14
65+
runner: macos-13 # macos intel
6666
os-cmake-args: '-DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -flto -ffunction-sections -fdata-sections" -DCMAKE_OSX_DEPLOYMENT_TARGET=11 ${MACOS_CMAKE_ARGS}'
6767
build-args: '-j$(sysctl -n hw.ncpu)'
6868
bindir: '/build/bin'
@@ -88,6 +88,7 @@ jobs:
8888
-DZSTD_STATIC_LINKING_ONLY=1
8989
-DLLVM_ENABLE_ASSERTIONS=OFF
9090
-DZLIB_USE_STATIC_LIBS=ON
91+
-DLLVM_TARGETS_TO_BUILD=X86
9192
LINUX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10'
9293
RELEASE: '${{ matrix.release }}'
9394
suffix: '${{ matrix.clang-version }}_${{ matrix.os }}-amd64'
@@ -141,15 +142,13 @@ jobs:
141142
if: ${{ matrix.os == 'macosx' }}
142143
shell: bash
143144
run: |
144-
sed -i.backup 's/gcc_eh.\*|/gcc_eh.*|gcc_ext.*|/g' "$(find /opt/homebrew/Cellar -name CMakeParseImplicitLinkInfo.cmake)"
145-
brew install gcc@11
146-
- name: Update homebrew
147-
if: ${{ matrix.os == 'macosx' && matrix.clang-version >= '18' }}
148-
shell: bash
149-
run: |
150-
brew update
151-
brew upgrade
152-
brew cleanup
145+
BREW_PREFIX=$(brew --prefix)
146+
FILES=$(find "$BREW_PREFIX" -name CMakeParseImplicitLinkInfo.cmake)
147+
148+
for file in $FILES; do
149+
echo "Patching $file"
150+
sed -i.backup 's/gcc_eh.*|/gcc_eh.*|gcc_ext.*|/g' "$file"
151+
done
153152
- name: CMake
154153
run: cmake -S ${{ matrix.release }}/llvm -B ${{ matrix.release }}/build ${{ env.COMMON_CMAKE_ARGS }} ${{ matrix.os-cmake-args }} ${{ matrix.extra-cmake-args }}
155154
- name: Build

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Python virtual environment
2+
venv/
3+
./venv/

0 commit comments

Comments
 (0)