Return-Path: Received: from conuserg-10.nifty.com ([210.131.2.77]:47422 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbgCZF6N (ORCPT ); Thu, 26 Mar 2020 01:58:13 -0400 From: Masahiro Yamada Subject: [PATCH v2 4/4] kbuild: remove AS variable Date: Thu, 26 Mar 2020 14:57:18 +0900 Message-Id: <20200326055719.16755-4-masahiroy@kernel.org> In-Reply-To: <20200326055719.16755-1-masahiroy@kernel.org> References: <20200326055719.16755-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: linux-kbuild@vger.kernel.org Cc: clang-built-linux@googlegroups.com, Geert Uytterhoeven , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org As commit 5ef872636ca7 ("kbuild: get rid of misleading $(AS) from documents") noted, we rarely use $(AS) directly in the kernel build. Now that the only/last user of $(AS) in drivers/net/wan/Makefile was converted to $(CC), $(AS) is no longer used in the build process. You can still pass in AS=clang, which is just a switch to turn on the LLVM integrated assembler. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers Reviewed-by: Nathan Chancellor --- Changes in v2: - Fix breakage of CC=clang build Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fcec84681e4e..2e12fa1cc8f3 100644 --- a/Makefile +++ b/Makefile @@ -405,7 +405,6 @@ KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS) KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS) # Make variables (CC, etc...) -AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E @@ -535,7 +534,7 @@ endif ifneq ($(GCC_TOOLCHAIN),) CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -ifeq ($(shell $(AS) --version 2>&1 | head -n 1 | grep clang),) +ifeq ($(if $(AS),$(shell $(AS) --version 2>&1 | head -n 1 | grep clang)),) CLANG_FLAGS += -no-integrated-as endif CLANG_FLAGS += -Werror=unknown-warning-option -- 2.17.1