github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-07 03:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1974 from Jakob-Naucke/fix-cc-fedora-s390x

Browse Source 
Update CC=gcc setting for Fedora s390x
This commit is contained in:
Fabiano Fidêncio
2021-06-11 00:31:51 +02:00
committed by GitHub
parent bd195d67d4 7593ebf947
commit dc4307d3cc
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -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}"