diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 13:26:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 13:26:58 -0400 |
| commit | 7cc2ed05891f424c2e323bc1a368ddb5c78b90f2 (patch) | |
| tree | db628f2dcbb51c0fe9ce15da5897c4ea1404be9f /tools/perf | |
| parent | 8dac6bee32425dd5145b40fa2307648cb7fb4d4a (diff) | |
| parent | 569658dddf276ceb0780776e7f5d61d9f8d8cb88 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Call depmod.sh via shell
perf: clear out make flags when calling kernel make kernelver
Diffstat (limited to 'tools/perf')
| -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 && | |||
| 23 | then | 23 | then |
| 24 | VN=$(echo "$VN" | sed -e 's/-/./g'); | 24 | VN=$(echo "$VN" | sed -e 's/-/./g'); |
| 25 | else | 25 | else |
| 26 | VN=$(make -sC ../.. kernelversion) | 26 | VN=$(MAKEFLAGS= make -sC ../.. kernelversion) |
| 27 | fi | 27 | fi |
| 28 | 28 | ||
| 29 | VN=$(expr "$VN" : v*'\(.*\)') | 29 | VN=$(expr "$VN" : v*'\(.*\)') |