[ARVADOS] updated: 2.1.0-1785-g0618092b9
Git user
git at public.arvados.org
Wed Jan 5 01:12:20 UTC 2022
Summary of changes:
build/run-library.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
via 0618092b9a2c9fa988df35f34d79f6fe68bf3380 (commit)
from cdd8c956123711e6752582132e1efb67b1a8880d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 0618092b9a2c9fa988df35f34d79f6fe68bf3380
Author: Ward Vandewege <ward at curii.com>
Date: Tue Jan 4 20:11:43 2022 -0500
17417: fix bug to enable arm64 cross-compilation on amd64 for our go packages.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index ed3211c2a..4370cc386 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -183,12 +183,12 @@ package_go_binary() {
# but only when building deb packages (centos does not have support for crosscompiling userspace).
archs=($native_arch)
if [[ "$native_arch" == "amd64" ]] && [[ "$package_format" == "deb" ]]; then
- archs=('amd64' 'arm64')
+ archs+=("arm64")
fi
- for ta in $archs; do
+ for ta in ${archs[@]}; do
package_go_binary_worker "$src_path" "$prog" "$package_format" "$description" "$native_arch" "$ta" "$license_file"
retval=$?
- if [[ "$retval" != 0 ]]; then
+ if [[ $retval -ne 0 ]]; then
return $retval
fi
done
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list