Commit 32234049 authored by HONG Yifan's avatar HONG Yifan Committed by Josh Poimboeuf
Browse files

objtool: Use HOSTCFLAGS for HAVE_XXHASH test 



Previously, HAVE_XXHASH is tested by invoking HOSTCC without HOSTCFLAGS.

Consider the following scenario:

- The host machine has libxxhash installed
- We build the kernel with HOSTCFLAGS containing a --sysroot that does
  not have xxhash.h (for hermetic builds)

In this case, HAVE_XXHASH is set to y, but when it builds objtool with
HOSTCFLAGS, because the --sysroot does not contain xxhash.h, the
following error is raised:

<...>/common/tools/objtool/include/objtool/checksum_types.h:12:10: fatal error: 'xxhash.h' file not found
   12 | #include <xxhash.h>
      |          ^~~~~~~~~~

To resolve the error, we test HAVE_XXHASH by invoking HOSTCC with
HOSTCFLAGS.

Signed-off-by: default avatarHONG Yifan <elsk@google.com>
Reviewed-by: default avatarCarlos Llamas <cmllamas@google.com>
Link: https://patch.msgid.link/20260303010340.306164-1-elsk@google.com


Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent 11c2adcd

tools/objtool/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ endif 


ifeq ($(ARCH_HAS_KLP),y)

	HAVE_XXHASH = $(shell printf "$(pound)include <xxhash.h>\nXXH3_state_t *state;int main() {}" | \

		      $(HOSTCC) -xc - -o /dev/null -lxxhash 2> /dev/null && echo y || echo n)

		      $(HOSTCC) $(HOSTCFLAGS) -xc - -o /dev/null -lxxhash 2> /dev/null && echo y || echo n)

	ifeq ($(HAVE_XXHASH),y)

		BUILD_KLP	 := y

		LIBXXHASH_CFLAGS := $(shell $(HOSTPKG_CONFIG) libxxhash --cflags 2>/dev/null) \