Skip to content

Fix build_apple_frameworks.sh buck resolution #9372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

Fix build_apple_frameworks.sh buck resolution #9372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d38e6
Fix build_apple_frameworks.sh buck resolution
shoumikhin Mar 18, 2025
2baefa5
Update build_apple_frameworks.sh
shoumikhin Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions build/build_apple_frameworks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,31 @@ if [[ -z "$TOOLCHAIN" ]]; then
fi
[[ -f "$TOOLCHAIN" ]] || { echo >&2 "Toolchain file $TOOLCHAIN does not exist."; exit 1; }

BUCK2=$("$PYTHON" "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_dir="$SOURCE_ROOT_DIR/buck2-bin")

if [[ "$BUCK2" == "buck2" ]]; then
BUCK2=$(command -v buck2)
fi

check_command() {
command -v "$1" >/dev/null 2>&1 || { echo >&2 "$1 is not installed"; exit 1; }
if [[ "$1" == */* ]]; then
if [[ ! -x "$1" ]]; then
echo "Error: Command not found or not executable at '$1'" >&2
exit 1
fi
else
if ! command -v "$1" >/dev/null 2>&1; then
echo "Error: Command '$1' not found in PATH" >&2
exit 1
fi
fi
}

check_command cmake
check_command rsync
check_command "$PYTHON"
check_command "$FLATC"
check_command "$BUCK2"

echo "Building libraries"

Expand Down Expand Up @@ -205,14 +222,6 @@ echo "Exporting headers"

mkdir -p "$HEADERS_PATH"

BUCK2=$("$PYTHON" "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_dir="$SOURCE_ROOT_DIR/buck2-bin")
if [[ -z "$BUCK2" ]]; then
echo "Could not find buck2 executable in any buck2-bin directory under $SOURCE_ROOT_DIR"
BUCK2=$(which buck2)
fi

check_command "$BUCK2"

"$SOURCE_ROOT_DIR"/build/print_exported_headers.py --buck2=$(realpath "$BUCK2") --targets \
//extension/module: \
//extension/tensor: \
Expand Down
Loading