Skip to content

Commit 238bcbc

Browse files
committed
kbuild: consolidate Clang compiler flags
Collect basic Clang options such as --target, --prefix, --gcc-toolchain, -no-integrated-as into a single variable CLANG_FLAGS so that it can be easily reused in other parts of Makefile. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Tested-by: Nick Desaulniers <ndesaulniers@google.com> Acked-by: Greg Hackmann <ghackmann@google.com>
1 parent dbe27a0 commit 238bcbc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -487,18 +487,17 @@ endif
487487

488488
ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)
489489
ifneq ($(CROSS_COMPILE),)
490-
CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
490+
CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
491491
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
492-
CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR)
492+
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
493493
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
494494
endif
495495
ifneq ($(GCC_TOOLCHAIN),)
496-
CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
496+
CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN)
497497
endif
498-
KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
499-
KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
500-
KBUILD_CFLAGS += -no-integrated-as
501-
KBUILD_AFLAGS += -no-integrated-as
498+
CLANG_FLAGS += -no-integrated-as
499+
KBUILD_CFLAGS += $(CLANG_FLAGS)
500+
KBUILD_AFLAGS += $(CLANG_FLAGS)
502501
endif
503502

504503
RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

0 commit comments

Comments
 (0)