diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-01 08:24:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-01 08:24:39 +0200 |
| commit | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 (patch) | |
| tree | ad712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 /tools/perf/Makefile.perf | |
| parent | 201131998fbf074b03679afedcc29948e63331ef (diff) | |
| parent | 399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 (diff) | |
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/Makefile.perf')
| -rw-r--r-- | tools/perf/Makefile.perf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 46e0c32ad23b..5e21aad44142 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -593,7 +593,7 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) $(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $< $(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS) - $(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) + $(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \ |