Skip to content

Commit b4ec757

Browse files
committed
Use a more standard way of picking Homebrew's Bison
1 parent 476f3ae commit b4ec757

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

.github/scripts/install_deps.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ case "${1%%-*}" in
1313
# However, CMake automatically uses Homebrew's `gmake`, so our CI has synced output.
1414
brew install bison md5sha1sum make
1515
# Export `bison` to allow using the version we install from Homebrew,
16-
# instead of the outdated one preinstalled on macOS (which doesn't even support `-Wall`...)
17-
# This path ↓ is used on Intel macOS, and this one ↓ on ARM ones.
18-
export PATH="/usr/local/opt/bison/bin:/opt/homebrew/opt/bison/bin:$PATH"
19-
printf 'PATH=%s\n' "$PATH" >>"$GITHUB_ENV" # Make it available to later CI steps too
16+
# instead of the outdated one preinstalled on macOS (which doesn't even support `-Wall`...).
17+
brew link --force bison
2018
;;
2119
freebsd)
2220
pkg install -y bash bison cmake git png
@@ -34,6 +32,6 @@ case "${1%%-*}" in
3432
esac
3533

3634
echo "PATH=($PATH)" | sed 's/:/\n /g'
37-
bison --version
38-
make --version
39-
cmake --version
35+
type -a bison && bison --version
36+
type -a make && make --version
37+
type -a cmake && cmake --version

0 commit comments

Comments
 (0)