Skip to content

Commit 7e6fdbf

Browse files
committed
Remove protobuf_FORCE_FETCH_DEPENDENCIES since it is downloading abseil anyway even without it. Remoe -DABSL_INTERNAL_AT_LEAST_CXX17=-0 since I have used c++17 everywhere and this resolves the linker issue.
1 parent 9888b79 commit 7e6fdbf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

buildscripts/grpc-java-artifacts/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ RUN yum install -y \
55
automake \
66
diffutils \
77
gcc-c++ \
8+
git \
89
glibc-devel \
910
glibc-devel.i686 \
1011
java-11-openjdk-devel \

buildscripts/make_dependencies.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ else
4343
if [[ "$(uname -s)" == "Darwin" ]]; then
4444
cmake .. \
4545
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
46-
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
46+
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
4747
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
48-
-Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
4948
-B. || exit 1
5049
elif [[ "$ARCH" == x86* ]]; then
5150
CFLAGS=-m${ARCH#*_} CXXFLAGS=-m${ARCH#*_} cmake .. \
5251
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
53-
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
54-
-Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
52+
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
5553
-B. || exit 1
5654
else
5755
if [[ "$ARCH" == aarch_64 ]]; then
@@ -68,7 +66,7 @@ else
6866
fi
6967
cmake .. \
7068
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
71-
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
69+
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
7270
-Dcrosscompile_ARCH="$GCC_ARCH" \
7371
-DCMAKE_TOOLCHAIN_FILE=$BUILDSCRIPTS_DIR/toolchain.cmake \
7472
-B. || exit 1

0 commit comments

Comments
 (0)