Skip to content
Permalink
Browse files

correcting the s390x Arch name

  • Loading branch information
salamaniibm authored and acozzette committed Jan 10, 2020
1 parent 5a578d2 commit c3ffdabed533e64c535c1d7f663d0e08235bb750
@@ -23,7 +23,7 @@ sudo apt install -y g++-powerpc64le-linux-gnu
protoc-artifacts/build-protoc.sh linux ppcle_64 protoc

sudo apt install -y g++-s390x-linux-gnu
protoc-artifacts/build-protoc.sh linux s390x_64 protoc
protoc-artifacts/build-protoc.sh linux s390x protoc

# Use docker image to build linux artifacts.
DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ")
@@ -123,7 +123,7 @@ target directory layout:
protoc.exe
+ ppcle_64
protoc.exe
+ s390x_64
+ s390x
protoc.exe
+ osx
+ x86_64
@@ -93,7 +93,7 @@ checkArch ()
assertEq $format "elf64-x86-64" $LINENO
elif [[ "$ARCH" == aarch_64 ]]; then
assertEq $format "elf64-little" $LINENO
elif [[ "$ARCH" == s390x_64 ]]; then
elif [[ "$ARCH" == s390x ]]; then
if [[ $host_machine == s390x ]];then
assertEq $format "elf64-s390" $LINENO
else
@@ -149,7 +149,7 @@ checkDependencies ()
white_list="linux-gate\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux\.so\.2"
elif [[ "$ARCH" == x86_64 ]]; then
white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2"
elif [[ "$ARCH" == s390x_64 ]]; then
elif [[ "$ARCH" == s390x ]]; then
if [[ $host_machine != s390x ]];then
dump_cmd='objdump -p '"$1"' | grep NEEDED'
fi
@@ -226,7 +226,7 @@ elif [[ "$(uname)" == Linux* ]]; then
elif [[ "$ARCH" == ppcle_64 ]]; then
CXXFLAGS="$CXXFLAGS -m64"
CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu"
elif [[ "$ARCH" == s390x_64 ]]; then
elif [[ "$ARCH" == s390x ]]; then
CXXFLAGS="$CXXFLAGS -m64"
CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu"
else
@@ -22,7 +22,7 @@ included. Each invocation will create 9 zip packages:
dist/<TARGET>-<VERSION_NUMBER>-linux-x86_64.zip
dist/<TARGET>-<VERSION_NUMBER>-linux-aarch_64.zip
dist/<TARGET>-<VERSION_NUMBER>-linux-ppcle_64.zip
dist/<TARGET>-<VERSION_NUMBER>-linux-s390x_64.zip
dist/<TARGET>-<VERSION_NUMBER>-linux-s390x.zip
EOF
exit 1
fi
@@ -40,7 +40,7 @@ declare -a FILE_NAMES=( \
linux-x86_64.zip linux-x86_64.exe \
linux-aarch_64.zip linux-aarch_64.exe \
linux-ppcle_64.zip linux-ppcle_64.exe \
linux-s390x_64.zip linux-s390x_64.exe \
linux-s390x.zip linux-s390x.exe \
)

# List of all well-known types to be included.
@@ -86,8 +86,8 @@
<type>exe</type>
</artifact>
<artifact>
<file>${basedir}/target/linux/s390x_64/protoc.exe</file>
<classifier>linux-s390x_64</classifier>
<file>${basedir}/target/linux/s390x/protoc.exe</file>
<classifier>linux-s390x</classifier>
<type>exe</type>
</artifact>
</artifacts>

0 comments on commit c3ffdab

Please sign in to comment.
You can’t perform that action at this time.