From 1cc909bdea06bf5c5dfc5ace2bddf177d2aca8bc Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 22 May 2018 14:59:35 -0700 Subject: [PATCH] FROMLIST: arm64: vdso32: Use full path to Clang instead of relying on PATH Currently, in order to build the compat VDSO with Clang, this format has to be used: PATH=${BIN_FOLDER}:${PATH} make CC=clang Prior to the addition of this file, this format would also be acceptable: make CC=${BIN_FOLDER}/clang This is because the vdso32 Makefile uses cc-name instead of CC. After this path, CC will still evaluate to clang for the first case as expected but now the second case will use the specified Clang, rather than the host's copy, which may not be compatible as shown below. /usr/bin/as: unrecognized option '-mfloat-abi=soft' clang-6.0: error: assembler command failed with exit code 1 Signed-off-by: Nathan Chancellor (cherry picked from https://patchwork.kernel.org/patch/10419665) Bug: 80184372 Change-Id: If90a5a4edbc2b5883b4c78161081ebeafbebdcde --- arch/arm64/kernel/vdso32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index e9ca1f97a543..807d08e28c27 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -5,7 +5,7 @@ # A mix between the arm64 and arm vDSO Makefiles. ifeq ($(cc-name),clang) - CC_ARM32 := $(cc-name) $(CLANG_TARGET_ARM32) -no-integrated-as + CC_ARM32 := $(CC) $(CLANG_TARGET_ARM32) -no-integrated-as GCC_ARM32_TC := $(realpath $(dir $(shell which $(CROSS_COMPILE_ARM32)ld))/..) ifneq ($(GCC_ARM32_TC),) CC_ARM32 += --gcc-toolchain=$(GCC_ARM32_TC) -- 2.20.1