mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Jean-Philippe Brucker <jean-philippe@linaro.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://lore.kernel.org/bpf/20201110164310.2600671-2-jean-philippe@linaro.org
This commit is contained in:
		
							parent
							
								
									7112d12798
								
							
						
					
					
						commit
						c8a950d0d3
					
				
					 6 changed files with 10 additions and 27 deletions
				
			
		| 
						 | 
					@ -18,15 +18,6 @@ else
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# always use the host compiler
 | 
					# 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)
 | 
					AR       = $(HOSTAR)
 | 
				
			||||||
CC       = $(HOSTCC)
 | 
					CC       = $(HOSTCC)
 | 
				
			||||||
LD       = $(HOSTLD)
 | 
					LD       = $(HOSTLD)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,10 +15,6 @@ endef
 | 
				
			||||||
$(call allow-override,CC,$(CROSS_COMPILE)gcc)
 | 
					$(call allow-override,CC,$(CROSS_COMPILE)gcc)
 | 
				
			||||||
$(call allow-override,LD,$(CROSS_COMPILE)ld)
 | 
					$(call allow-override,LD,$(CROSS_COMPILE)ld)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HOSTCC ?= gcc
 | 
					 | 
				
			||||||
HOSTLD ?= ld
 | 
					 | 
				
			||||||
HOSTAR ?= ar
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
export HOSTCC HOSTLD HOSTAR
 | 
					export HOSTCC HOSTLD HOSTAR
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(V),1)
 | 
					ifeq ($(V),1)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,15 +3,6 @@ include ../scripts/Makefile.include
 | 
				
			||||||
include ../scripts/Makefile.arch
 | 
					include ../scripts/Makefile.arch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# always use the host compiler
 | 
					# 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)
 | 
					AR	 = $(HOSTAR)
 | 
				
			||||||
CC	 = $(HOSTCC)
 | 
					CC	 = $(HOSTCC)
 | 
				
			||||||
LD	 = $(HOSTLD)
 | 
					LD	 = $(HOSTLD)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -175,10 +175,6 @@ endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LD += $(EXTRA_LDFLAGS)
 | 
					LD += $(EXTRA_LDFLAGS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HOSTCC  ?= gcc
 | 
					 | 
				
			||||||
HOSTLD  ?= ld
 | 
					 | 
				
			||||||
HOSTAR  ?= ar
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PKG_CONFIG = $(CROSS_COMPILE)pkg-config
 | 
					PKG_CONFIG = $(CROSS_COMPILE)pkg-config
 | 
				
			||||||
LLVM_CONFIG ?= llvm-config
 | 
					LLVM_CONFIG ?= llvm-config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -54,7 +54,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 | 
				
			||||||
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 | 
					CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 | 
				
			||||||
CROSS_COMPILE ?= $(CROSS)
 | 
					CROSS_COMPILE ?= $(CROSS)
 | 
				
			||||||
LD = $(CC)
 | 
					LD = $(CC)
 | 
				
			||||||
HOSTCC = gcc
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# check if compiler option is supported
 | 
					# 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;}
 | 
					cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -59,6 +59,16 @@ $(call allow-override,LD,$(CROSS_COMPILE)ld)
 | 
				
			||||||
$(call allow-override,CXX,$(CROSS_COMPILE)g++)
 | 
					$(call allow-override,CXX,$(CROSS_COMPILE)g++)
 | 
				
			||||||
$(call allow-override,STRIP,$(CROSS_COMPILE)strip)
 | 
					$(call allow-override,STRIP,$(CROSS_COMPILE)strip)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ifneq ($(LLVM),)
 | 
				
			||||||
 | 
					HOSTAR  ?= llvm-ar
 | 
				
			||||||
 | 
					HOSTCC  ?= clang
 | 
				
			||||||
 | 
					HOSTLD  ?= ld.lld
 | 
				
			||||||
 | 
					else
 | 
				
			||||||
 | 
					HOSTAR  ?= ar
 | 
				
			||||||
 | 
					HOSTCC  ?= gcc
 | 
				
			||||||
 | 
					HOSTLD  ?= ld
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(CC_NO_CLANG), 1)
 | 
					ifeq ($(CC_NO_CLANG), 1)
 | 
				
			||||||
EXTRA_WARNINGS += -Wstrict-aliasing=3
 | 
					EXTRA_WARNINGS += -Wstrict-aliasing=3
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue