Commit c8a950d0 authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Andrii Nakryiko
Browse files

tools: Factor HOSTCC, HOSTLD, HOSTAR definitions 



Several Makefiles in tools/ need to define the host toolchain variables.
Move their definition to tools/scripts/Makefile.include

Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/bpf/20201110164310.2600671-2-jean-philippe@linaro.org
parent 7112d127

tools/bpf/resolve_btfids/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ else 
endif



# always use the host compiler

ifneq ($(LLVM),)

HOSTAR  ?= llvm-ar

HOSTCC  ?= clang

HOSTLD  ?= ld.lld

else

HOSTAR  ?= ar

HOSTCC  ?= gcc

HOSTLD  ?= ld

endif

AR       = $(HOSTAR)

CC       = $(HOSTCC)

LD       = $(HOSTLD)

tools/build/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ endef 
$(call allow-override,CC,$(CROSS_COMPILE)gcc)

$(call allow-override,LD,$(CROSS_COMPILE)ld)



HOSTCC ?= gcc

HOSTLD ?= ld

HOSTAR ?= ar



export HOSTCC HOSTLD HOSTAR



ifeq ($(V),1)

tools/objtool/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -3,15 +3,6 @@ include ../scripts/Makefile.include 
include ../scripts/Makefile.arch



# always use the host compiler

ifneq ($(LLVM),)

HOSTAR	?= llvm-ar

HOSTCC	?= clang

HOSTLD	?= ld.lld

else

HOSTAR	?= ar

HOSTCC	?= gcc

HOSTLD	?= ld

endif

AR	 = $(HOSTAR)

CC	 = $(HOSTCC)

LD	 = $(HOSTLD)

tools/perf/Makefile.perf

+0 −4
Original line number Diff line number Diff line
@@ -175,10 +175,6 @@ endef 


LD += $(EXTRA_LDFLAGS)



HOSTCC  ?= gcc

HOSTLD  ?= ld

HOSTAR  ?= ar



PKG_CONFIG = $(CROSS_COMPILE)pkg-config

LLVM_CONFIG ?= llvm-config

tools/power/acpi/Makefile.config

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} 
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-

CROSS_COMPILE ?= $(CROSS)

LD = $(CC)

HOSTCC = gcc



# check if compiler option is supported

cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}

CRA Git | Maintained and supported by SUSTech CRA and CCSE