diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:22:57 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:31:41 +0000 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /tools/perf/config/feature-checks/Makefile | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
| download | linux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.gz | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'tools/perf/config/feature-checks/Makefile')
| -rw-r--r-- | tools/perf/config/feature-checks/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 12e551346fa6..523b7bc10553 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile @@ -121,7 +121,7 @@ test-libpython-version.bin: $(BUILD) $(FLAGS_PYTHON_EMBED) test-libbfd.bin: - $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl + $(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl test-liberty.bin: $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty |