Skip to content

Commit 8d046de

Browse files
authored
fix: arm builds via disabling abseil tests (#2758)
fix: disable abseil tests Signed-off-by: Dave Lee <[email protected]>
1 parent 2845bae commit 8d046de

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ jobs:
7878
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN
7979
GRPC_DIR=$PWD/grpc
8080
81-
# http://google.github.io/googletest/quickstart-cmake.html
82-
# Seems otherwise cross-arch fails to find it
83-
echo "include(FetchContent)" >> $GRPC_DIR/CMakeLists.txt
84-
echo "FetchContent_Declare(" >> $GRPC_DIR/CMakeLists.txt
85-
echo " googletest" >> $GRPC_DIR/CMakeLists.txt
86-
echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/CMakeLists.txt
87-
echo ")" >> $GRPC_DIR/CMakeLists.txt
88-
echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/CMakeLists.txt
89-
9081
cd grpc && cd cmake/build && sudo make --jobs 5 --output-sync=target install && \
9182
GRPC_CROSS_BUILD_DIR=$GRPC_DIR/cmake/cross_build && \
9283
mkdir -p $GRPC_CROSS_BUILD_DIR && \

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ backend/cpp/llama/llama.cpp:
701701
INSTALLED_PACKAGES=$(CURDIR)/backend/cpp/grpc/installed_packages
702702
INSTALLED_LIB_CMAKE=$(INSTALLED_PACKAGES)/lib/cmake
703703
ADDED_CMAKE_ARGS=-Dabsl_DIR=${INSTALLED_LIB_CMAKE}/absl \
704+
-DABSL_BUILD_TESTING=OFF \
704705
-DProtobuf_DIR=${INSTALLED_LIB_CMAKE}/protobuf \
705706
-Dutf8_range_DIR=${INSTALLED_LIB_CMAKE}/utf8_range \
706707
-DgRPC_DIR=${INSTALLED_LIB_CMAKE}/grpc \

0 commit comments

Comments
 (0)