diff options
| author |  namrata-ibm <bhavenamrata@gmail.com> | 2016-10-11 09:59:27 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-10-11 13:26:24 +0000 |
| commit | 155bd6457c7426faa84b5acba991a1c80cdcf920 (patch) | |
| tree | 3f4db04a5f52722548cd3b0d6f45fce20d5df5bd /scripts/bootstrap | |
| parent | 22d36737aa2a37edecf6c855e61f82df3c79596b (diff) | |
Adding support for Linux s390x
We have added support for Linux s390x platform in Bazel.
Closes #1891.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/1891
MOS_MIGRATED_REVID=135777047
Diffstat (limited to 'scripts/bootstrap')
| -rwxr-xr-x | scripts/bootstrap/buildenv.sh | 7 | ||||
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh index 4a946878c2..8345dc307d 100755 --- a/scripts/bootstrap/buildenv.sh +++ b/scripts/bootstrap/buildenv.sh @@ -40,7 +40,7 @@ PLATFORM="$(uname -s | tr 'A-Z' 'a-z')" MACHINE_TYPE="$(uname -m)" MACHINE_IS_64BIT='no' -if [ "${MACHINE_TYPE}" = 'amd64' -o "${MACHINE_TYPE}" = 'x86_64' ]; then +if [ "${MACHINE_TYPE}" = 'amd64' -o "${MACHINE_TYPE}" = 'x86_64' -o "${MACHINE_TYPE}" = 's390x' ]; then MACHINE_IS_64BIT='yes' fi @@ -49,6 +49,11 @@ if [ "${MACHINE_TYPE}" = 'arm' -o "${MACHINE_TYPE}" = 'armv7l' -o "${MACHINE_TYP MACHINE_IS_ARM='yes' fi +MACHINE_IS_Z='no' +if [ "${MACHINE_TYPE}" = 's390x' ]; then + MACHINE_IS_Z='yes' +fi + # Extension for executables. EXE_EXT="" case "${PLATFORM}" in diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index f4939c10a9..123d050a96 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -43,8 +43,13 @@ linux) # JAVA_HOME must point to a Java installation. JAVA_HOME="${JAVA_HOME:-$(readlink -f $(which javac) | sed 's_/bin/javac__')}" if [ "${MACHINE_IS_64BIT}" = 'yes' ]; then - PROTOC=${PROTOC:-third_party/protobuf/protoc-linux-x86_64.exe} - GRPC_JAVA_PLUGIN=${GRPC_JAVA_PLUGIN:-third_party/grpc/protoc-gen-grpc-java-0.15.0-linux-x86_64.exe} + if [ "${MACHINE_IS_Z}" = 'yes' ]; then + PROTOC=${PROTOC:-third_party/protobuf/protoc-linux-s390x_64.exe} + GRPC_JAVA_PLUGIN=${GRPC_JAVA_PLUGIN:-third_party/grpc/protoc-gen-grpc-java-0.15.0-linux-s390x_64.exe} + else + PROTOC=${PROTOC:-third_party/protobuf/protoc-linux-x86_64.exe} + GRPC_JAVA_PLUGIN=${GRPC_JAVA_PLUGIN:-third_party/grpc/protoc-gen-grpc-java-0.15.0-linux-x86_64.exe} + fi else if [ "${MACHINE_IS_ARM}" = 'yes' ]; then PROTOC=${PROTOC:-third_party/protobuf/protoc-linux-arm32.exe} |