github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +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
commit dc4307d3cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/arch/s390x-options.mk
View File

@ -11,3 +11,10 @@ MACHINEACCELERATORS :=
CPUFEATURES :=
QEMUCMD := qemu-system-s390x
# See https://github.com/kata-containers/osbuilder/issues/217
FEDORA_LIKE = $(shell grep -E "\<fedora\>" /etc/os-release 2> /dev/null)
ifneq (,$(FEDORA_LIKE))
CC := gcc
export CC
endif

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