Skip to content

Commit fe81a62

Browse files
committed
DO NOT MERGE: try to fix macOS CI
Assisted-by: GPT-5.6 Sol <codex@openai.com>
1 parent fa20039 commit fe81a62

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

ci/scripts/jni_macos_build.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,25 @@ cmake \
7777
cmake --build "${build_dir}/cpp" --target install
7878
github_actions_group_end
7979

80+
absl_build_dir="${build_dir}/cpp/_deps/absl-build"
81+
absl_cmake_dir=""
82+
if [ -d "${absl_build_dir}" ]; then
83+
github_actions_group_begin "Installing bundled Abseil"
84+
cmake --build "${build_dir}/cpp" --target _deps/absl-build/all --config Release
85+
cmake --install "${absl_build_dir}" --prefix "${install_dir}" --config Release
86+
absl_cmake_dir="${install_dir}/lib/cmake/absl"
87+
if [ ! -f "${absl_cmake_dir}/abslConfig.cmake" ]; then
88+
echo "Bundled Abseil CMake package was not installed in ${absl_cmake_dir}" >&2
89+
exit 1
90+
fi
91+
github_actions_group_end
92+
fi
93+
8094
JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build"
8195
JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src"
96+
if [ -n "${absl_cmake_dir}" ]; then
97+
JAVA_JNI_CMAKE_ARGS+=" -Dabsl_DIR=${absl_cmake_dir}"
98+
fi
8299
export JAVA_JNI_CMAKE_ARGS
83100
"${source_dir}/ci/scripts/jni_build.sh" \
84101
"${source_dir}" \

0 commit comments

Comments
 (0)