diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-18 23:48:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-18 23:48:24 +0200 |
| commit | 34c861e71eb391d7a2fd11209be4259f1f203d96 (patch) | |
| tree | 408c641ac5843cc19bfcd94520d0f04401c6eba7 /tools | |
| parent | 3df24197baa4effd7d243d351f1d4dc0ceb3fed7 (diff) | |
| parent | c11760c6d80ab6aa20e383cf378a7287305f591c (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 9c5fb4d93824..ad73300f7bac 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git && then VN=$(echo "$VN" | sed -e 's/-/./g'); else - VN=$(make -sC ../.. kernelversion) + VN=$(MAKEFLAGS= make -sC ../.. kernelversion) fi VN=$(expr "$VN" : v*'\(.*\)') |