From 35672e9fbe9e6204632944bac7064fcf5941a2ad Mon Sep 17 00:00:00 2001 From: Anthony Shoumikhin Date: Tue, 18 Mar 2025 11:12:45 -0700 Subject: [PATCH 1/2] Use resolve_buck script to find buck executable when building Apple frameworks --- build/build_apple_frameworks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_apple_frameworks.sh b/build/build_apple_frameworks.sh index 6654ea5fae0..07a6c2a3baa 100755 --- a/build/build_apple_frameworks.sh +++ b/build/build_apple_frameworks.sh @@ -205,7 +205,7 @@ echo "Exporting headers" mkdir -p "$HEADERS_PATH" -BUCK2=$(find $SOURCE_ROOT_DIR -type f -path '*/buck2-bin/buck2-*' | head -n 1) +BUCK2=$("$PYTHON" "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_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) From 8c6e6a35dc87ad51f56110d93a1bb5921b119960 Mon Sep 17 00:00:00 2001 From: Anthony Shoumikhin Date: Tue, 18 Mar 2025 11:19:51 -0700 Subject: [PATCH 2/2] Update build_apple_frameworks.sh --- build/build_apple_frameworks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_apple_frameworks.sh b/build/build_apple_frameworks.sh index 07a6c2a3baa..7a128b5a9ea 100755 --- a/build/build_apple_frameworks.sh +++ b/build/build_apple_frameworks.sh @@ -205,7 +205,7 @@ echo "Exporting headers" mkdir -p "$HEADERS_PATH" -BUCK2=$("$PYTHON" "$SOURCE_ROOT_DIR/tools/cmake/resolve_buck.py" --cache_dir="buck2-bin") +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)