kvmtool: refresh crosscompiler patch

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-12-07 11:59:46 -05:00
parent 3002a90c6d
commit e675e3ebbf

View File

@ -13,11 +13,11 @@ be linked against the cross-compiled libfdt library.
Makefile | 8 +------- Makefile | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-) 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/Makefile b/Makefile Index: git/Makefile
index e9121dc..c05b2c0 100644 ===================================================================
--- a/Makefile --- git.orig/Makefile
+++ b/Makefile +++ git/Makefile
@@ -19,12 +19,6 @@ include config/utilities.mak @@ -19,12 +19,6 @@
include config/feature-tests.mak include config/feature-tests.mak
-include $(OUTPUT)KVMTOOLS-VERSION-FILE -include $(OUTPUT)KVMTOOLS-VERSION-FILE
@ -30,12 +30,12 @@ index e9121dc..c05b2c0 100644
FIND := find FIND := find
CSCOPE := cscope CSCOPE := cscope
TAGS := ctags TAGS := ctags
@@ -343,7 +337,7 @@ $(warning No static libc found. Skipping guest init) @@ -367,7 +361,7 @@
endif
ifeq (y,$(ARCH_WANT_LIBFDT))
- ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y)
+ ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y)
$(error No libfdt found. Please install libfdt-dev package)
else
CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT
CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT
CFLAGS += -I $(LIBFDT_DIR)
- else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y)
+ else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y)
LIBFDT_STATIC :=
CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT
CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT