From 4fd24e2fc57f0ee673dda1cbc9619c379d34c21d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 6 Jul 2018 04:36:21 +0100 Subject: [PATCH] linux-tools: Fix cross-build of objtool objtool is normally built and used during the kernel build process, in which case it should always be built as a native executable. But when we build it for linux-tools it should match the target architecture. We need to override the CC and LD variables to make this work. --- debian/changelog | 4 ++++ debian/rules.d/tools/objtool/Makefile | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 146801074..7b71cfd57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ linux (4.17.3-2) UNRELEASED; urgency=medium + [ Sjoerd Simons ] * [armhf] DRM: Enable CONFIG_DRM_IMX_PARALLEL_DISPLAY + [ Ben Hutchings ] + * linux-tools: Fix cross-build of objtool + -- Sjoerd Simons Wed, 04 Jul 2018 10:25:57 +0200 linux (4.17.3-1) unstable; urgency=medium diff --git a/debian/rules.d/tools/objtool/Makefile b/debian/rules.d/tools/objtool/Makefile index 532e5b793..cc2ea9e22 100644 --- a/debian/rules.d/tools/objtool/Makefile +++ b/debian/rules.d/tools/objtool/Makefile @@ -3,7 +3,9 @@ include $(top_rulesdir)/Makefile.inc all: # For now, only supported target architecture is x86. Later we'll need to build # for multiple targets and add a wrapper, same as for modpost. - $(MAKE) -C $(top_srcdir)/tools/objtool O=$(CURDIR) ARCH=x86 +# objtool explicitly sets CC and LD to be native tools; we need to override +# this on the command line to make cross-builds work. + $(MAKE) -C $(top_srcdir)/tools/objtool O=$(CURDIR) ARCH=x86 CC=$(CC) LD=$(CROSS_COMPILE)ld install: install -D -m755 objtool $(DESTDIR)/$(installdir)/objtool