diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-01 06:24:39 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-01 06:24:39 (GMT) |
| commit | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 (patch) | |
| tree | ad712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 /tools/perf/tests | |
| parent | 201131998fbf074b03679afedcc29948e63331ef (diff) | |
| parent | 399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 (diff) | |
| download | linux-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
tools/perf/arch/x86/tests/dwarf-unwind.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests')
| -rw-r--r-- | tools/perf/tests/make | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 5daeae1..2f92d6e 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -46,6 +46,7 @@ make_install_man := install-man make_install_html := install-html make_install_info := install-info make_install_pdf := install-pdf +make_static := LDFLAGS=-static # all the NO_* variable combined make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 @@ -87,6 +88,7 @@ run += make_install_bin # run += make_install_info # run += make_install_pdf run += make_minimal +run += make_static ifneq ($(call has,ctags),) run += make_tags |