Fix Macos arm64 build.

PiperOrigin-RevId: 708471085
google · Dec 21, 2024 · d3f075d · d3f075d
1 parent 77c56dc
commit d3f075d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/grain/oss/build_whl.sh b/grain/oss/build_whl.sh
@@ -3,13 +3,10 @@
 
 set -e -x
 
-CP_VERSION="cp${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}"
-PYTHON_BIN_PATH="/opt/python/${CP_VERSION}-${CP_VERSION}/bin/python"
-
 function main() {
   bazel clean
-  bazel build ... --action_env PYTHON_BIN_PATH="${PYTHON_BIN_PATH}" --action_env MACOSX_DEPLOYMENT_TARGET=11.0
-  bazel test --verbose_failures --test_output=errors ... --action_env PYTHON_BIN_PATH="${PYTHON_BIN_PATH}"
+  bazel build ... --action_env PYTHON_BIN_PATH="${PYTHON_BIN}" --action_env MACOSX_DEPLOYMENT_TARGET=11.0
+  bazel test --verbose_failures --test_output=errors ... --action_env PYTHON_BIN_PATH="${PYTHON_BIN}"
 
   DEST="/tmp/grain/all_dist"
   mkdir -p "${DEST}"
@@ -38,11 +35,13 @@ function main() {
     plat_name="--plat-name macosx_11_0_$(uname -m)"
   fi
 
-  "python${PYTHON_VERSION}" setup.py bdist_wheel --python-tag py3${PYTHON_MINOR_VERSION} $plat_name
+  $PYTHON_BIN setup.py bdist_wheel --python-tag py3${PYTHON_MINOR_VERSION} $plat_name
   cp dist/*.whl "${DEST}"
 
-  echo $(date) : "=== Auditing wheel"
-  auditwheel repair --plat ${AUDITWHEEL_PLATFORM} -w dist dist/*.whl
+  if [ -n "${AUDITWHEEL_PLATFORM}" ]; then
+    echo $(date) : "=== Auditing wheel"
+    auditwheel repair --plat ${AUDITWHEEL_PLATFORM} -w dist dist/*.whl
+  fi
 
   echo $(date) : "=== Listing wheel"
   ls -lrt dist/*.whl

diff --git a/grain/oss/runner_common.sh b/grain/oss/runner_common.sh
@@ -80,7 +80,7 @@ function update_bazel_macos {
 }
 
 function install_grain_deps {
-  AR_DIR="./grain/oss/array_record"
+  AR_DIR="$SOURCE_DIR/grain/oss/array_record"
   $PYTHON_BIN -m pip install -U --find-links=$AR_DIR array_record --no-cache-dir;
   $PYTHON_BIN -m pip install -U \
     absl-py \