perf tools: Fix x86 builds with ARCH specified on the command line
authorDavid Ahern <dsahern@gmail.com>
Mon, 27 Aug 2012 19:05:54 +0000 (13:05 -0600)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 5 Sep 2012 20:23:30 +0000 (17:23 -0300)
commit09a2f16a916178489fc4bf439de668d81fda7616
tree3e4ef06a1a295327f524b1ad5219c5348fbdbff0
parent8d3eca20b9f31cf10088e283d704f6a71b9a4ee2
perf tools: Fix x86 builds with ARCH specified on the command line

e.g., compiling i386 on x86_64 using:
$ make -C tools/perf ARCH=i386

fails with:

    CC /tmp/pbuild/util/evsel.o
In file included from util/evsel.c:21:0:
util/perf_regs.h:5:23: fatal error: perf_regs.h: No such file or directory
compilation terminated.

Adding V=1 you see that the include argument for the arch is
'-Iarch/i386/include' is wrong. It is supposed to be -Iarch/x86/include
per the redefinition of ARCH in the Makefile.

According to the make manual,
http://www.gnu.org/software/make/manual/make.html#Override-Directive:
  "If a variable has been set with a command argument (see Overriding
   Variables), then ordinary assignments in the makefile are ignored. If
   you want to set the variable in the makefile even though it was set
   with a command argument, you can use an override directive ..."

Make it so.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1346094354-74356-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile