Skip to content

Commit 0377ca2

Browse files
committed
fix(ci): avoid embedding Homebrew libunwind in macOS builds
1 parent fcb95b7 commit 0377ca2

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ jobs:
5050
- if: startsWith(matrix.config.os, 'macos')
5151
run: |
5252
brew install llvm libomp
53-
BREW_PREFIX="$(brew --prefix)"
54-
echo "PATH=$BREW_PREFIX/opt/llvm/bin:${PATH}" >> $GITHUB_ENV
55-
echo "CPPFLAGS=-I$BREW_PREFIX/opt/llvm/include -I$BREW_PREFIX/opt/libomp/include" >> $GITHUB_ENV
56-
echo "LDFLAGS=-L$BREW_PREFIX/opt/llvm/lib/c++ -L$BREW_PREFIX/opt/llvm/lib/unwind -lunwind -L$BREW_PREFIX/opt/libomp/lib" >> $GITHUB_ENV
57-
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
58-
echo "CXX=$BREW_PREFIX/opt/llvm/bin/clang++" >> $GITHUB_ENV
53+
make ci-github-env >> $GITHUB_ENV
5954
6055
- run: make -j ${{ matrix.target.target }}
6156
shell: bash

.github/workflows/python-publish.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,7 @@ jobs:
6767
- if: startsWith(matrix.config.os, 'macos')
6868
run: |
6969
brew install llvm libomp
70-
BREW_PREFIX="$(brew --prefix)"
71-
echo "PATH=$BREW_PREFIX/opt/llvm/bin:${PATH}" >> $GITHUB_ENV
72-
echo "CPPFLAGS=-I$BREW_PREFIX/opt/llvm/include -I$BREW_PREFIX/opt/libomp/include" >> $GITHUB_ENV
73-
echo "LDFLAGS=-L$BREW_PREFIX/opt/llvm/lib/c++ -L$BREW_PREFIX/opt/llvm/lib/unwind -lunwind -L$BREW_PREFIX/opt/libomp/lib" >> $GITHUB_ENV
74-
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
75-
echo "CXX=$BREW_PREFIX/opt/llvm/bin/clang++" >> $GITHUB_ENV
70+
make ci-github-env >> $GITHUB_ENV
7671
- run: make py-build
7772
shell: bash
7873
env:

.github/workflows/release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@ jobs:
5757
- if: startsWith(matrix.config.os, 'macos')
5858
run: |
5959
brew install llvm libomp
60-
BREW_PREFIX="$(brew --prefix)"
61-
echo "PATH=$BREW_PREFIX/opt/llvm/bin:${PATH}" >> $GITHUB_ENV
62-
echo "CPPFLAGS=-I$BREW_PREFIX/opt/llvm/include -I$BREW_PREFIX/opt/libomp/include" >> $GITHUB_ENV
63-
echo "LDFLAGS=-L$BREW_PREFIX/opt/llvm/lib/c++ -L$BREW_PREFIX/opt/llvm/lib/unwind -lunwind -L$BREW_PREFIX/opt/libomp/lib" >> $GITHUB_ENV
64-
echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
65-
echo "CXX=$BREW_PREFIX/opt/llvm/bin/clang++" >> $GITHUB_ENV
60+
make ci-github-env >> $GITHUB_ENV
6661
6762
- run: make -j ${{ matrix.target.target }}
6863
shell: bash

Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,19 @@ print-env:
344344
@echo "LDFLAGS=$(LDFLAGS)"
345345
@echo "MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)"
346346
@echo "BREW=$(BREW)"
347+
348+
349+
##################################################
350+
# CI helpers
351+
##################################################
352+
353+
.PHONY: ci-github-env
354+
ci-github-env:
355+
@BREW="$$(brew --prefix 2>/dev/null || true)"; \
356+
if [ -n "$$BREW" ]; then \
357+
echo "PATH=$$BREW/opt/llvm/bin:$$PATH"; \
358+
echo "CPPFLAGS=$$CPPFLAGS -I$$BREW/opt/llvm/include -I$$BREW/opt/libomp/include"; \
359+
echo "LDFLAGS=$$LDFLAGS -L$$BREW/opt/llvm/lib/c++ -L$$BREW/opt/libomp/lib"; \
360+
echo "MACOSX_DEPLOYMENT_TARGET=15.0"; \
361+
echo "CXX=$$BREW/opt/llvm/bin/clang++"; \
362+
fi

0 commit comments

Comments
 (0)