perf build: Do not fail on missing Build file
authorJiri Olsa <jolsa@kernel.org>
Fri, 29 May 2015 15:42:58 +0000 (17:42 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 29 May 2015 15:44:25 +0000 (12:44 -0300)
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 <rabin.vincent@axis.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rabin Vincent <rabin.vincent@axis.com>
Link: http://lkml.kernel.org/r/1432914178-24086-1-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/build/Makefile.build
tools/build/tests/ex/Build
tools/build/tests/ex/empty2/README [new file with mode: 0644]

index 10df57237a66d26913a4baabd5949f3459f0a534..69c35cf09cad25d7a711388af6e1ca449cfffe77 100644 (file)
@@ -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    $@
index 0e6c3e6767e6c553c34bff9ad6db7b440429d515..70d876237c5709f36a985c4f8c52a56a063167f7 100644 (file)
@@ -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 (file)
index 0000000..2107cc5
--- /dev/null
@@ -0,0 +1,2 @@
+This directory is left intentionally without Build file
+to test proper nesting into Build-less directories.