diff options
-rw-r--r-- | tools/perf/Makefile.perf | 2 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index aecf61dcd754..478efa9b2364 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -497,8 +497,6 @@ ifneq ($(OUTPUT),) | |||
497 | endif | 497 | endif |
498 | 498 | ||
499 | ifdef NO_LIBELF | 499 | ifdef NO_LIBELF |
500 | EXTLIBS := $(filter-out -lelf,$(EXTLIBS)) | ||
501 | |||
502 | # Remove ELF/DWARF dependent codes | 500 | # Remove ELF/DWARF dependent codes |
503 | LIB_OBJS := $(filter-out $(OUTPUT)util/symbol-elf.o,$(LIB_OBJS)) | 501 | LIB_OBJS := $(filter-out $(OUTPUT)util/symbol-elf.o,$(LIB_OBJS)) |
504 | LIB_OBJS := $(filter-out $(OUTPUT)util/dwarf-aux.o,$(LIB_OBJS)) | 502 | LIB_OBJS := $(filter-out $(OUTPUT)util/dwarf-aux.o,$(LIB_OBJS)) |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 79f906c7124e..5d4b039fe1ed 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -150,7 +150,7 @@ CFLAGS += -std=gnu99 | |||
150 | # adding assembler files missing the .GNU-stack linker note. | 150 | # adding assembler files missing the .GNU-stack linker note. |
151 | LDFLAGS += -Wl,-z,noexecstack | 151 | LDFLAGS += -Wl,-z,noexecstack |
152 | 152 | ||
153 | EXTLIBS = -lelf -lpthread -lrt -lm -ldl | 153 | EXTLIBS = -lpthread -lrt -lm -ldl |
154 | 154 | ||
155 | ifneq ($(OUTPUT),) | 155 | ifneq ($(OUTPUT),) |
156 | OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/ | 156 | OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/ |
@@ -354,6 +354,7 @@ endif # NO_LIBELF | |||
354 | 354 | ||
355 | ifndef NO_LIBELF | 355 | ifndef NO_LIBELF |
356 | CFLAGS += -DHAVE_LIBELF_SUPPORT | 356 | CFLAGS += -DHAVE_LIBELF_SUPPORT |
357 | EXTLIBS += -lelf | ||
357 | 358 | ||
358 | ifeq ($(feature-libelf-mmap), 1) | 359 | ifeq ($(feature-libelf-mmap), 1) |
359 | CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT | 360 | CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT |
@@ -373,7 +374,7 @@ ifndef NO_LIBELF | |||
373 | else | 374 | else |
374 | CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS) | 375 | CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS) |
375 | LDFLAGS += $(LIBDW_LDFLAGS) | 376 | LDFLAGS += $(LIBDW_LDFLAGS) |
376 | EXTLIBS += -lelf -ldw | 377 | EXTLIBS += -ldw |
377 | endif # PERF_HAVE_DWARF_REGS | 378 | endif # PERF_HAVE_DWARF_REGS |
378 | endif # NO_DWARF | 379 | endif # NO_DWARF |
379 | endif # NO_LIBELF | 380 | endif # NO_LIBELF |