Skip to content

Commit d906c2d

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

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

ci/scripts/jni_macos_build.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,19 @@ 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+
if [ -d "${absl_build_dir}" ]; then
82+
github_actions_group_begin "Installing bundled Abseil"
83+
cmake --install "${absl_build_dir}" --prefix "${install_dir}" --config Release
84+
github_actions_group_end
85+
fi
86+
8087
JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build"
8188
JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src"
89+
absl_cmake_dir="${install_dir}/lib/cmake/absl"
90+
if [ -d "${absl_cmake_dir}" ]; then
91+
JAVA_JNI_CMAKE_ARGS+=" -Dabsl_DIR=${absl_cmake_dir}"
92+
fi
8293
export JAVA_JNI_CMAKE_ARGS
8394
"${source_dir}/ci/scripts/jni_build.sh" \
8495
"${source_dir}" \

0 commit comments

Comments
 (0)