From 64b069443614aaa3fedb913ac8cbef8007f2edff Mon Sep 17 00:00:00 2001
From: Amulya Meka <amulmek1@in.ibm.com>
Date: Tue, 18 Aug 2020 16:00:26 +0530
Subject: [PATCH] ppc64le: Support for rust agent based rootfs

For building rust agent on ppc64le, the rust toolchain is built using
the LIBC implementation - gnu instead of musl.

Fixes: #481

Signed-off-by: Amulya Meka <amulmek1@in.ibm.com>
---
 tools/osbuilder/rootfs-builder/rootfs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
index 67a23d86a..483a7e83c 100755
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -26,6 +26,7 @@ OSBUILDER_VERSION="unknown"
 DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
 GO_VERSION="null"
 export GOPATH=${GOPATH:-${HOME}/go}
+LIBC=${LIBC:-musl}
 
 lib_file="${script_dir}/../scripts/lib.sh"
 source "$lib_file"
@@ -574,8 +575,8 @@ EOT
 		pushd "${agent_dir}"
 		[ -n "${AGENT_VERSION}" ] && git checkout "${AGENT_VERSION}" && OK "git checkout successful" || info "checkout failed!"
 		make clean
-		make INIT=${AGENT_INIT}
-		make install DESTDIR="${ROOTFS_DIR}" INIT=${AGENT_INIT} SECCOMP=${SECCOMP}
+		make LIBC=${LIBC} INIT=${AGENT_INIT}
+		make install DESTDIR="${ROOTFS_DIR}" LIBC=${LIBC} INIT=${AGENT_INIT} SECCOMP=${SECCOMP}
 		popd
 	else
 		cp ${AGENT_SOURCE_BIN} ${AGENT_DEST}
@@ -631,7 +632,7 @@ See issue: https://github.com/kata-containers/osbuilder/issues/386"
 		fi
 	fi
 
-	if [ "${RUST_AGENT}" == "yes" ] && [ "${arch}" == "s390x" -o "${arch}" == "ppc64le" ]; then
+	if [ "${RUST_AGENT}" == "yes" ] && [ "${arch}" == "s390x" ]; then
 		die "Cannot build rust agent on ppc64le.
 musl cannot be built on ppc64le because of long double
 reprentation is broken. And rust has no musl target on ppc64le.