mirror of https://github.com/grpc/grpc-node.git
Merge pull request #750 from murgatroid99/grpc-tools-64-bit-linux
grpc-tools: Force 64 bit Linux build
This commit is contained in:
commit
baa361e277
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
uname -a
|
||||||
|
|
||||||
cd $(dirname $0)
|
cd $(dirname $0)
|
||||||
base=$(pwd)
|
base=$(pwd)
|
||||||
protobuf_base=$base/deps/protobuf
|
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=-DCMAKE_TOOLCHAIN_FILE=linux_32bit.toolchain.cmake
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
toolchain_flag=
|
toolchain_flag=-DCMAKE_TOOLCHAIN_FILE=linux_64bit.toolchain.cmake
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
rm -f $base/build/bin/protoc
|
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
|
cmake $toolchain_flag . && cmake --build . --target clean && cmake --build . -- -j 12
|
||||||
cp -L $protobuf_base/protoc $base/build/bin/protoc
|
cp -L $protobuf_base/protoc $base/build/bin/protoc
|
||||||
cp $base/grpc_node_plugin $base/build/bin/
|
cp $base/grpc_node_plugin $base/build/bin/
|
||||||
|
file $base/build/bin/*
|
||||||
cd $base/build
|
cd $base/build
|
||||||
tar -czf "$out_dir/$platform-$arch.tar.gz" bin/
|
tar -czf "$out_dir/$platform-$arch.tar.gz" bin/
|
||||||
cd $base
|
cd $base
|
||||||
|
|
|
||||||
|
|
@ -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")
|
||||||
|
|
@ -6,6 +6,8 @@ OS=$(uname)
|
||||||
|
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
|
|
||||||
|
uname -a
|
||||||
|
|
||||||
case $OS in
|
case $OS in
|
||||||
Linux)
|
Linux)
|
||||||
docker build -t kokoro-native-image tools/release/native
|
docker build -t kokoro-native-image tools/release/native
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue