[ARVADOS] updated: 2.1.0-1778-g4db7a388c

[Git user]

Summary of changes:
 build/run-library.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

       via  4db7a388ce1543d013ac5bfe97f7431eae95d422 (commit)
      from  43af94d367b231d23da4a21ad07ea30057fb0247 (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 4db7a388ce1543d013ac5bfe97f7431eae95d422
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Dec 30 11:59:57 2021 -0500

    17417: no cross compilation support on CentOS.
    
    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 fd04c25ed..eb7f08627 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -188,7 +188,12 @@ package_go_binary_worker() {
 
     echo "BUILDING ${arch}"
     if [[ "$arch" == "arm64" ]] && [[ "$native_arch" == "amd64" ]]; then
-      CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
+      if [[ "$FORMAT" == "deb" ]]; then
+        CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
+      else
+        echo "Error: no cross compilation support for Go on $native_arch ($FORMAT), can not build $prog for $ARCH"
+        return
+      fi
     else
       GOARCH=${arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
     fi

-----------------------------------------------------------------------


hooks/post-receive
--