From da2d9ab813b46f633b53ec4bb94b434f659eb98a Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Mon, 7 Jun 2021 17:32:05 +0200 Subject: [PATCH] osbuilder: Remove CC=gcc for Fedora s390x since that was required specifically for the Go agent Fixes: #1973 Signed-off-by: Jakob Naucke --- tools/osbuilder/rootfs-builder/rootfs.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 9fbe49bad..51126f96e 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -562,10 +562,6 @@ EOT -e '/^\[Unit\]/a ConditionPathExists=\/dev\/ptp0' ${chrony_systemd_service} fi - # The CC on s390x for fedora needs to be manually set to gcc when the golang is downloaded from the main page. - # See issue: https://github.com/kata-containers/osbuilder/issues/217 - [ "$distro" == "fedora" ] && [ "$ARCH" == "s390x" ] && export CC=gcc - AGENT_DIR="${ROOTFS_DIR}/usr/bin" AGENT_DEST="${AGENT_DIR}/${AGENT_BIN}"