Commit 1739cafd authored by Jinghao Jia's avatar Jinghao Jia Committed by Benjamin Tissoires
Browse files

samples/hid: remove unnecessary -I flags from libbpf EXTRA_CFLAGS 



Commit 5a6ea702 ("samples/bpf: Remove unnecessary -I flags from
libbpf EXTRA_CFLAGS") fixed the build error caused by redundant include
path for samples/bpf, but not samples/hid.

Apply the same fix on samples/hid as well.

Fixes: 13b25489 ("kbuild: change working directory to external module directory with M=")
Tested-by: default avatarRuowen Qin <ruqin@redhat.com>
Signed-off-by: default avatarJinghao Jia <jinghao7@illinois.edu>
Link: https://patch.msgid.link/20250203085506.220297-2-jinghao7@illinois.edu


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 9271af9d

samples/hid/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -40,16 +40,17 @@ BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic 
endif

endif



TPROGS_CFLAGS += -Wall -O2

TPROGS_CFLAGS += -Wmissing-prototypes

TPROGS_CFLAGS += -Wstrict-prototypes

COMMON_CFLAGS += -Wall -O2

COMMON_CFLAGS += -Wmissing-prototypes

COMMON_CFLAGS += -Wstrict-prototypes



TPROGS_CFLAGS += $(COMMON_CFLAGS)

TPROGS_CFLAGS += -I$(objtree)/usr/include

TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE)

TPROGS_CFLAGS += -I$(srctree)/tools/include



ifdef SYSROOT

TPROGS_CFLAGS += --sysroot=$(SYSROOT)

COMMON_CFLAGS += --sysroot=$(SYSROOT)

TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib

endif
@@ -112,7 +113,7 @@ clean: 


$(LIBBPF): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUTPUT)

# Fix up variables inherited from Kbuild that tools/ build system won't like

	$(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \

	$(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(COMMON_CFLAGS)" \

		LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(HID_SAMPLES_PATH)/../../ \

		O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \

		$@ install_headers