From 14cadff0a4bf969baef51183e496578d2d96814c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:31:29 -0500 Subject: [PATCH] -fcf-protection cflag NOT for centos <= 7 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 7a29eeae7ce0ee139eb01315cb1a3da22cad5fa9) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index bd25c0a..8019e03 100644 --- a/podman.spec +++ b/podman.spec @@ -420,7 +420,10 @@ export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) export CGO_CFLAGS='-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64' %ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection" +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +%endif %endif # These extra flags present in %%{optflags} have been skipped for now as they break the build #export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"