Skip to content

Commit f89fb55

Browse files
captain5050acmel
authored andcommitted
perf build: Don't propagate subdir to submakes for install_headers
subdir is added to the OUTPUT which fails as part of building install_headers when passed from "make -C tools perf_install". Committer testing: The original reporter (see the Link: below) had trouble with this: $ make -C tools perf_install That ended up with errors like this: /var/home/acme/git/perf-urgent/tools/scripts/Makefile.include:17: *** output directory "/var/home/acme/git/perf-urgent/tools/perf/libperf/perf/" does not exist. Stop. With this patch applied we now get it installed at: INSTALL /var/home/acme/git/perf-urgent/tools/perf/libperf/include/perf/bpf_perf.h As expected: $ ls -la /var/home/acme/git/perf-urgent/tools/perf/libperf/include/perf/bpf_perf.h -rw-r--r--. 1 acme acme 1146 Jan 3 15:42 /var/home/acme/git/perf-urgent/tools/perf/libperf/include/perf/bpf_perf.h And if we clean tools with: $ make -C tools clean it gets cleaned up: $ ls -la /var/home/acme/git/perf-urgent/tools/perf/libperf/include/perf/bpf_perf.h ls: cannot access '/var/home/acme/git/perf-urgent/tools/perf/libperf/include/perf/bpf_perf.h': No such file or directory $ Fixes: 746bd29 ("perf build: Use tools/lib headers from install path") Reported-by: Torsten Hilbrich <[email protected]> Signed-off-by: Ian Rogers <[email protected]> Tested-by: Arnaldo Carvalho de Melo <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent b963c1d commit f89fb55

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/perf/Makefile.perf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)
819819

820820
$(LIBAPI): FORCE | $(LIBAPI_OUTPUT)
821821
$(Q)$(MAKE) -C $(LIBAPI_DIR) O=$(LIBAPI_OUTPUT) \
822-
DESTDIR=$(LIBAPI_DESTDIR) prefix= \
822+
DESTDIR=$(LIBAPI_DESTDIR) prefix= subdir= \
823823
$@ install_headers
824824

825825
$(LIBAPI)-clean:
@@ -828,7 +828,7 @@ $(LIBAPI)-clean:
828828

829829
$(LIBBPF): FORCE | $(LIBBPF_OUTPUT)
830830
$(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=$(FEATURE_DUMP_EXPORT) \
831-
O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \
831+
O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= subdir= \
832832
$@ install_headers
833833

834834
$(LIBBPF)-clean:
@@ -837,7 +837,7 @@ $(LIBBPF)-clean:
837837

838838
$(LIBPERF): FORCE | $(LIBPERF_OUTPUT)
839839
$(Q)$(MAKE) -C $(LIBPERF_DIR) O=$(LIBPERF_OUTPUT) \
840-
DESTDIR=$(LIBPERF_DESTDIR) prefix= \
840+
DESTDIR=$(LIBPERF_DESTDIR) prefix= subdir= \
841841
$@ install_headers
842842

843843
$(LIBPERF)-clean:
@@ -846,7 +846,7 @@ $(LIBPERF)-clean:
846846

847847
$(LIBSUBCMD): FORCE | $(LIBSUBCMD_OUTPUT)
848848
$(Q)$(MAKE) -C $(LIBSUBCMD_DIR) O=$(LIBSUBCMD_OUTPUT) \
849-
DESTDIR=$(LIBSUBCMD_DESTDIR) prefix= \
849+
DESTDIR=$(LIBSUBCMD_DESTDIR) prefix= subdir= \
850850
$@ install_headers
851851

852852
$(LIBSUBCMD)-clean:
@@ -855,7 +855,7 @@ $(LIBSUBCMD)-clean:
855855

856856
$(LIBSYMBOL): FORCE | $(LIBSYMBOL_OUTPUT)
857857
$(Q)$(MAKE) -C $(LIBSYMBOL_DIR) O=$(LIBSYMBOL_OUTPUT) \
858-
DESTDIR=$(LIBSYMBOL_DESTDIR) prefix= \
858+
DESTDIR=$(LIBSYMBOL_DESTDIR) prefix= subdir= \
859859
$@ install_headers
860860

861861
$(LIBSYMBOL)-clean:

0 commit comments

Comments
 (0)