summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2019-05-16 13:49:42 -0400
committerIngo Molnar <mingo@kernel.org>2019-05-17 05:10:42 -0400
commit8ea58f1e8b11cca3087b294779bf5959bf89cc10 (patch)
treef592ebbbc54de60d57a4fe780dbe4746c5acfda8
parent5a28fc94c9143db766d1ba5480cae82d856ad080 (diff)
objtool: Allow AR to be overridden with HOSTAR
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>
-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
7endif 7endif
8 8
9# always use the host compiler 9# always use the host compiler
10HOSTAR ?= ar
10HOSTCC ?= gcc 11HOSTCC ?= gcc
11HOSTLD ?= ld 12HOSTLD ?= ld
13AR = $(HOSTAR)
12CC = $(HOSTCC) 14CC = $(HOSTCC)
13LD = $(HOSTLD) 15LD = $(HOSTLD)
14AR = ar
15 16
16ifeq ($(srctree),) 17ifeq ($(srctree),)
17srctree := $(patsubst %/,%,$(dir $(CURDIR))) 18srctree := $(patsubst %/,%,$(dir $(CURDIR)))