summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-09 17:00:23 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-10-14 10:29:05 -0300
commit3fb66335e13ef7426affe9efa48c08857202c1cb (patch)
tree79ac28d0e912e5c81c08363fb0a6093e0761e552
parent4e987712740a3634c19a6fedaf12577b26775dc5 (diff)
downloadlinux-stable-3fb66335e13ef7426affe9efa48c08857202c1cb.tar.gz
linux-stable-3fb66335e13ef7426affe9efa48c08857202c1cb.tar.bz2
linux-stable-3fb66335e13ef7426affe9efa48c08857202c1cb.zip
tools/perf/build: Fix non-existent build directory handling
Arnaldo reported that non-existent build directories were not recognized properly. The reason is readlink failure causing 'O' to become empty. Solve it by passing through the 'O' variable unmodified if readlink fails. Reported-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20131009150023.GA10167@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5aa3d040bbf3..914704495166 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -34,7 +34,7 @@ endif
# Only pass canonical directory names as the output directory:
#
ifneq ($(O),)
- FULL_O := $(shell readlink -f $(O))
+ FULL_O := $(shell readlink -f $(O) || echo $(O))
endif
define print_msg