From 479b3f84f97be9a229931d8eb97b596257dc297b Mon Sep 17 00:00:00 2001
From: Greg Tucker <greg.b.tucker@intel.com>
Date: Tue, 9 Jan 2024 19:34:41 +0000
Subject: [PATCH] build: fix CET default in unix Makefile

CET default flag was clobbering CFLAGS.

Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>
---
 make.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make.inc b/make.inc
index 993cb9c5..8149b1a6 100644
--- a/make.inc
+++ b/make.inc
@@ -80,7 +80,8 @@ LDFLAGS_so = -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,$(soname)
 
 ifeq ($(shell uname),Linux)
 ifeq ($(host_cpu),x86_64)
-  CFLAGS_ = -fcf-protection=full
+  CFLAGS_ += -fcf-protection=full
+  ASFLAGS_ += -DINTEL_CET_ENABLED
   LDFLAGS += -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
 endif
 endif