Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecafda60 authored by Kusanagi Kouichi's avatar Kusanagi Kouichi Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix build error on read only source. 



Parts of the build process were generating files outside the specified
O= directory, causing the build to fail on systems where the sources are
in a read only file system.

Fix it by using $(OUTPUT) on these locations.

Also check that $(OUTPUT) actually exists, just like the top level
kernel Makefile does. Otherwise the failure message emitted is
completely misleading.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <20100817140841.0859362C03A@msa106.auone-net.jp>
Signed-off-by: default avatarKusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 033a273f

tools/perf/Makefile

+10 −4
Original line number Diff line number Diff line
@@ -5,6 +5,12 @@ endif 
# The default target of this Makefile is...

all::



ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif



# Define V=1 to have a more verbose compile.

# Define V=2 to have an even more verbose compile.

#
@@ -931,15 +937,15 @@ $(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt) 
	$(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@



$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh

	$(QUIET_GEN)$(RM) $@ $@+ && \

	$(QUIET_GEN)$(RM) $(OUTPUT)$@ $(OUTPUT)$@+ && \

	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \

	    -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \

	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \

	    -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \

	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \

	    $@.sh >$@+ && \

	chmod +x $@+ && \

	mv $@+ $(OUTPUT)$@

	    $@.sh > $(OUTPUT)$@+ && \

	chmod +x $(OUTPUT)$@+ && \

	mv $(OUTPUT)$@+ $(OUTPUT)$@



configure: configure.ac

	$(QUIET_GEN)$(RM) $@ $<+ && \

tools/perf/feature-tests.mak

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ endef 
# try-cc

# Usage: option = $(call try-cc, source-to-build, cc-options)

try-cc = $(shell sh -c						  \

	'TMP="$(TMPOUT).$$$$";			 		  \

	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \

	 echo "$(1)" |						  \

	 $(CC) -x c - $(2) -o "$$TMP" > /dev/null 2>&1 && echo y; \

	 rm -f "$$TMP"')