summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2019-05-16 12:49:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 18:23:33 +0200
commite738fb38cf2e630f5a063a230ed628b0a4d962c2 (patch)
tree8ebea0d2e67ffc670589ecfc138d63ff2850c5c6 /tools
parent9ae0f86ceaa734c7f9abbca0237587a3b6b3bb31 (diff)
downloadlinux-rpi3-e738fb38cf2e630f5a063a230ed628b0a4d962c2.tar.gz
linux-rpi3-e738fb38cf2e630f5a063a230ed628b0a4d962c2.tar.bz2
linux-rpi3-e738fb38cf2e630f5a063a230ed628b0a4d962c2.zip
objtool: Allow AR to be overridden with HOSTAR
commit 8ea58f1e8b11cca3087b294779bf5959bf89cc10 upstream. Currently, this Makefile hardcodes GNU ar, meaning that if it is not available, there is no way to supply a different one and the build will fail. $ make AR=llvm-ar CC=clang LD=ld.lld HOSTAR=llvm-ar HOSTCC=clang \ HOSTLD=ld.lld HOSTLDFLAGS=-fuse-ld=lld defconfig modules_prepare ... AR /out/tools/objtool/libsubcmd.a /bin/sh: 1: ar: not found ... Follow the logic of HOST{CC,LD} and allow the user to specify a different ar tool via HOSTAR (which is used elsewhere in other tools/ Makefiles). Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Cc: <stable@vger.kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/80822a9353926c38fd7a152991c6292491a9d0e8.1558028966.git.jpoimboe@redhat.com Link: https://github.com/ClangBuiltLinux/linux/issues/481 Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/objtool/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 53f8be0f4a1f..88158239622b 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -7,11 +7,12 @@ ARCH := x86
endif
# always use the host compiler
+HOSTAR ?= ar
HOSTCC ?= gcc
HOSTLD ?= ld
+AR = $(HOSTAR)
CC = $(HOSTCC)
LD = $(HOSTLD)
-AR = ar
ifeq ($(srctree),)
srctree := $(patsubst %/,%,$(dir $(CURDIR)))