libperf: Link static tests with libapi.a (395e62cd) · Commits · 戴 / test

Both static and dynamic tests needs to link with libapi.a, because it's using its functions. Also include path for libapi includes. Signed-off-by:

Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20191017105918.20873-5-jolsa@kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/lib/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ else
		endif

		LIBAPI = $(API_PATH)libapi.a
		export LIBAPI

		$(LIBAPI): FORCE
		$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a

tools/perf/lib/tests/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@ all:

		include $(srctree)/tools/scripts/Makefile.include

		INCLUDE = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include
		INCLUDE = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/lib

		$(TESTS_A): FORCE
		$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -o $@ $(subst -a,.c,$@) ../libperf.a
		$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -o $@ $(subst -a,.c,$@) ../libperf.a $(LIBAPI)

		$(TESTS_SO): FORCE
		$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -L.. -o $@ $(subst -so,.c,$@) -lperf
		$(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -L.. -o $@ $(subst -so,.c,$@) $(LIBAPI) -lperf

		all: $(TESTS_A) $(TESTS_SO)

Admin message