diff --git a/packages/grpc-tools/build_binaries.sh b/packages/grpc-tools/build_binaries.sh index 52b19f5c..2227e985 100755 --- a/packages/grpc-tools/build_binaries.sh +++ b/packages/grpc-tools/build_binaries.sh @@ -2,6 +2,8 @@ set -e +uname -a + cd $(dirname $0) base=$(pwd) protobuf_base=$base/deps/protobuf @@ -30,7 +32,7 @@ for arch in "${arch_list[@]}"; do toolchain_flag=-DCMAKE_TOOLCHAIN_FILE=linux_32bit.toolchain.cmake ;; *) - toolchain_flag= + toolchain_flag=-DCMAKE_TOOLCHAIN_FILE=linux_64bit.toolchain.cmake ;; esac rm -f $base/build/bin/protoc @@ -39,6 +41,7 @@ for arch in "${arch_list[@]}"; do cmake $toolchain_flag . && cmake --build . --target clean && cmake --build . -- -j 12 cp -L $protobuf_base/protoc $base/build/bin/protoc cp $base/grpc_node_plugin $base/build/bin/ + file $base/build/bin/* cd $base/build tar -czf "$out_dir/$platform-$arch.tar.gz" bin/ cd $base diff --git a/packages/grpc-tools/linux_64bit.toolchain.cmake b/packages/grpc-tools/linux_64bit.toolchain.cmake new file mode 100644 index 00000000..7a9b79a4 --- /dev/null +++ b/packages/grpc-tools/linux_64bit.toolchain.cmake @@ -0,0 +1,3 @@ +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64" CACHE STRING "c++ flags") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64" CACHE STRING "c flags") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m64" CACHE STRING "ld flags") \ No newline at end of file diff --git a/tools/release/kokoro-grpc-tools.sh b/tools/release/kokoro-grpc-tools.sh index 1930a5a6..065c5951 100755 --- a/tools/release/kokoro-grpc-tools.sh +++ b/tools/release/kokoro-grpc-tools.sh @@ -6,6 +6,8 @@ OS=$(uname) git submodule update --init --recursive +uname -a + case $OS in Linux) docker build -t kokoro-native-image tools/release/native