2013-10-05 17:57:59

by Ulrich Drepper

[permalink] [raw]
Subject: [PATCH] perf: remove duplicate block from Makefile

This looks like a merge error, the code is duplicated with the first
copy doing something else as well. Just remove the second block.

Signed-off-by: Ulrich Drepper <[email protected]>

Makefile | 8 --------
1 file changed, 8 deletions(-)


Index: perf/config/Makefile
===================================================================
--- perf.orig/config/Makefile
+++ perf/config/Makefile
@@ -200,14 +200,6 @@ endif # NO_DWARF

endif # NO_LIBELF

-ifndef NO_LIBELF
-CFLAGS += -DLIBELF_SUPPORT
-FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
-ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
- CFLAGS += -DLIBELF_MMAP
-endif # try-cc
-endif # NO_LIBELF
-
# There's only x86 (both 32 and 64) support for CFI unwind so far
ifneq ($(ARCH),x86)
NO_LIBUNWIND := 1