Skip to content

Commit 8d2bf03

Browse files
committed
fix apple libtool macro path and install glibtool check
1 parent 8919da7 commit 8d2bf03

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

do-compile/apple/bluray.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ if [[ -f 'configure' ]]; then
5252
else
5353
echo "auto generate configure"
5454
if [[ "$(uname)" == "Darwin" ]]; then
55+
# Homebrew may be in different locations depending on the CPU arch
56+
if [[ -d "/opt/homebrew/share/aclocal" ]]; then
57+
export ACLOCAL_PATH="/opt/homebrew/share/aclocal:$ACLOCAL_PATH"
58+
elif [[ -d "/usr/local/share/aclocal" ]]; then
59+
export ACLOCAL_PATH="/usr/local/share/aclocal:$ACLOCAL_PATH"
60+
fi
61+
5562
if command -v glibtoolize > /dev/null; then
5663
glibtoolize --force --copy
5764
elif command -v libtoolize > /dev/null; then

tools/export-apple-host-env.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@ export DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
4343

4444
function install_depends() {
4545
local name="$1"
46-
if command -v "$name" &> /dev/null; then
47-
echo "[✅] ${name}: $(eval $name --version)"
46+
local check_name="$name"
47+
# On macOS, GNU libtool is installed as glibtool to avoid conflict with Apple's libtool
48+
if [[ "$(uname)" == "Darwin" && "$name" == "libtool" ]]; then
49+
check_name="glibtool"
50+
fi
51+
52+
if command -v "$check_name" &> /dev/null; then
53+
echo "[✅] ${name}: $(eval $check_name --version | head -n 1)"
4854
return 0
4955
else
5056
if [[ "$name" == "rustup" || "$name" == "cargo" ]]; then

0 commit comments

Comments
 (0)