Skip to content

Commit d4c483a

Browse files
Merge pull request #8 from theseus-rs/add-openssl-to-mac-build
build: add openssl configuration to mac build
2 parents 93eb7cf + 940a73a commit d4c483a

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176

177177
- id: macos-arm64
178178
target: aarch64-apple-darwin
179-
os: macos-14
179+
os: macos-15
180180
architecture: "arm64"
181181

182182
- id: macos-x64
@@ -271,19 +271,22 @@ jobs:
271271
icu4c \
272272
llvm \
273273
lz4 \
274+
openssl \
274275
pkg-config \
275276
readline \
276277
xz \
277278
zstd
278279
279280
brew_dir="/usr/local"
280281
if [ "${{ matrix.id }}" == "macos-arm64" ]; then
281-
brew_dir="$HOME/brew"
282+
brew_dir="/opt/homebrew"
282283
fi
284+
brew_opt_dir="$brew_dir/opt"
285+
ls -l "$brew_opt_dir"
283286
284-
echo "CPPFLAGS=-I${brew_dir}/opt/icu4c/include" | tee -a $GITHUB_ENV
285-
echo "LDFLAGS=-L${brew_dir}/opt/icu4c/lib" | tee -a $GITHUB_ENV
286-
echo "LLVM_CONFIG=${brew_dir}/opt/llvm/bin/llvm-config" | tee -a $GITHUB_ENV
287+
echo "CPPFLAGS=-I${brew_opt_dir}/icu4c/include -I${brew_opt_dir}/openssl/include" | tee -a $GITHUB_ENV
288+
echo "LDFLAGS=-L${brew_opt_dir}/icu4c/lib -L${brew_opt_dir}/openssl/lib" | tee -a $GITHUB_ENV
289+
echo "LLVM_CONFIG=${brew_opt_dir}/llvm/bin/llvm-config" | tee -a $GITHUB_ENV
287290
288291
- name: Build (MacOS)
289292
if: ${{ startsWith(matrix.id, 'macos-') }}
@@ -302,6 +305,7 @@ jobs:
302305
--with-libxslt \
303306
$([ $major_version -ge 16 ] && echo "--with-llvm") \
304307
$([ $major_version -ge 14 ] && echo "--with-lz4") \
308+
--with-openssl \
305309
--with-pgport=5432 \
306310
$([ $major_version -ge 15 ] && echo "--with-python") \
307311
--with-readline \

0 commit comments

Comments
 (0)