From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbdIMHqR (ORCPT ); Wed, 13 Sep 2017 03:46:17 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54751 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751012AbdIMHqP (ORCPT ); Wed, 13 Sep 2017 03:46:15 -0400 Date: Wed, 13 Sep 2017 00:44:04 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com, dsahern@gmail.com, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com, dsahern@gmail.com, hpa@zytor.com, a.p.zijlstra@chello.nl, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de In-Reply-To: <20170908084621.31595-1-jolsa@kernel.org> References: <20170908084621.31595-1-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools lib api: Fix make DEBUG=1 build Git-Commit-ID: 58b79186c34306f4a14e98119afc10744a42fa40 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 58b79186c34306f4a14e98119afc10744a42fa40 Gitweb: http://git.kernel.org/tip/58b79186c34306f4a14e98119afc10744a42fa40 Author: Jiri Olsa AuthorDate: Fri, 8 Sep 2017 10:46:19 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Sep 2017 12:34:14 -0300 tools lib api: Fix make DEBUG=1 build Do not use -D_FORTIFY_SOURCE=2 for DEBUG build as it seems to mess up with debuginfo, which results in bad gdb experience. We already do that for tools/perf/. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170908084621.31595-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/api/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile index 4563ba7..1e83e3c 100644 --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile @@ -17,13 +17,19 @@ MAKEFLAGS += --no-print-directory LIBFILE = $(OUTPUT)libapi.a CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC +CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -fPIC +ifeq ($(DEBUG),0) ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3 else CFLAGS += -O6 endif +endif + +ifeq ($(DEBUG),0) + CFLAGS += -D_FORTIFY_SOURCE +endif # Treat warnings as errors unless directed not to ifneq ($(WERROR),0)