From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757231AbbE2SjK (ORCPT ); Fri, 29 May 2015 14:39:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35247 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752628AbbE2SjF (ORCPT ); Fri, 29 May 2015 14:39:05 -0400 Date: Fri, 29 May 2015 11:38:43 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, paulus@samba.org, a.p.zijlstra@chello.nl, acme@redhat.com, linux-kernel@vger.kernel.org, rabin.vincent@axis.com, hpa@zytor.com, jolsa@kernel.org Reply-To: a.p.zijlstra@chello.nl, namhyung@kernel.org, paulus@samba.org, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, rabin.vincent@axis.com, mingo@kernel.org, tglx@linutronix.de, dsahern@gmail.com In-Reply-To: <1432914178-24086-1-git-send-email-jolsa@kernel.org> References: <1432914178-24086-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Do not fail on missing Build file Git-Commit-ID: d7a3d85e08477a979933a2bb3b525a8de99543c2 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: d7a3d85e08477a979933a2bb3b525a8de99543c2 Gitweb: http://git.kernel.org/tip/d7a3d85e08477a979933a2bb3b525a8de99543c2 Author: Jiri Olsa AuthorDate: Fri, 29 May 2015 17:42:58 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 29 May 2015 12:44:25 -0300 perf build: Do not fail on missing Build file Allow nesting into directories without Build file. Currently we force include of the Build file, which fails the build when the Build file is missing. We already support empty *-in.o' objects if there's nothing in the directory to be compiled, so we can just use it for missing Build file cases. Also adding this case under tests. Reported-by: Rabin Vincent Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Rabin Vincent Link: http://lkml.kernel.org/r/1432914178-24086-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Makefile.build | 2 +- tools/build/tests/ex/Build | 1 + tools/build/tests/ex/empty2/README | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 10df572..69c35cf 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -37,7 +37,7 @@ subdir-obj-y := # Build definitions build-file := $(dir)/Build -include $(build-file) +-include $(build-file) quiet_cmd_flex = FLEX $@ quiet_cmd_bison = BISON $@ diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build index 0e6c3e6..70d8762 100644 --- a/tools/build/tests/ex/Build +++ b/tools/build/tests/ex/Build @@ -2,6 +2,7 @@ ex-y += ex.o ex-y += a.o ex-y += b.o ex-y += empty/ +ex-y += empty2/ libex-y += c.o libex-y += d.o diff --git a/tools/build/tests/ex/empty2/README b/tools/build/tests/ex/empty2/README new file mode 100644 index 0000000..2107cc5 --- /dev/null +++ b/tools/build/tests/ex/empty2/README @@ -0,0 +1,2 @@ +This directory is left intentionally without Build file +to test proper nesting into Build-less directories.