Skip to content

Commit 092efe4

Browse files
committed
Minor changes
1 parent b604fd0 commit 092efe4

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

buildscripts/grpc-java-artifacts/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,4 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" && \
2929

3030
RUN curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz | \
3131
tar xz -C /var/local
32-
33-
# Install Maven
34-
RUN curl -Ls https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz | \
35-
tar xz -C /var/local
36-
ENV PATH /var/local/cmake-3.26.3-linux-x86_64/bin:/var/local/apache-maven-3.8.8/bin:$PATH
32+
ENV PATH /var/local/cmake-3.26.3-linux-x86_64/bin:$PATH

buildscripts/make_dependencies.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ else
4545
CFLAGS=-m${ARCH#*_} CXXFLAGS=-m${ARCH#*_} cmake .. \
4646
-DCMAKE_CXX_STANDARD=14 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
4747
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
48-
-B.
48+
-B. || exit 1
4949
else
5050
if [[ "$ARCH" == aarch_64 ]]; then
5151
GCC_ARCH=aarch64-linux-gnu
@@ -64,11 +64,11 @@ else
6464
-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
6565
-Dcrosscompile_ARCH="$GCC_ARCH" \
6666
-DCMAKE_TOOLCHAIN_FILE=$BUILDSCRIPTS_DIR/toolchain.cmake \
67-
-B.
67+
-B. || exit 1
6868
fi
6969
export CMAKE_BUILD_PARALLEL_LEVEL="$NUM_CPU"
70-
cmake --build .
71-
cmake --install .
70+
cmake --build . || exit 1
71+
cmake --install . || exit 1
7272
[ -d "$INSTALL_DIR/lib64" ] && mv "$INSTALL_DIR/lib64" "$INSTALL_DIR/lib"
7373
popd
7474
fi

0 commit comments

Comments
 (0)