From 1db500c101bc7e6a61df53263cac8910ba540a66 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Fri, 25 Aug 2017 15:39:10 +0200
Subject: Fix build with CLANG, avoid GCC only CFLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 7c8d331fbb "Fine-tune compiler flags" added CFLAGS that are not
existing on CLANG hence breaking building coreboot with clang.

Fixes: https://ticket.coreboot.org/issues/134

Change-Id: Ie0250e285b0c5a9f8ee2eb99401aeca875d2789a
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/21202
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Damien Zammit <damien@zamaudio.com>
Reviewed-by: Martin Roth <martinroth@google.com>
---
 Makefile.inc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.inc')

diff --git a/Makefile.inc b/Makefile.inc
index 679e0ac393..ca9711d27b 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -363,7 +363,9 @@ CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
 CFLAGS_common += -Wstrict-aliasing -Wshadow -Wdate-time
 CFLAGS_common += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
 CFLAGS_common += -ffunction-sections -fdata-sections -fno-pie
+ifeq ($(CONFIG_COMPILER_GCC),y)
 CFLAGS_common += -fno-delete-null-pointer-checks -fconserve-stack
+endif
 
 ADAFLAGS_common += -gnatg -gnatp
 ADAFLAGS_common += -Wuninitialized -Wall -Werror
-- 
cgit v1.2.3