Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4eb20d authored by Paul Cercueil's avatar Paul Cercueil Committed by Michal Marek
Browse files

Makefile: Fix detection of clang when cross-compiling 



When the host's C compiler is clang, and when attempting to
cross-compile Linux e.g. to MIPS with mipsel-linux-gcc, the Makefile
would incorrectly detect the use of clang, which resulted in
clang-specific flags being passed to mipsel-linux-gcc.

This can be verified under Debian by installing the "clang" package,
and then using it as the default compiler with:
sudo update-alternatives --config cc

This patch moves the detection of clang after the $(CC) variable is
initialized to the name of the cross-compiler, so that the check applies
to the cross-compiler and not the host's C compiler.

v2: Move the detection of clang after the inclusion of the
arch/*/Makefile (as they might set $(CROSS_COMPILE))

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent b787f68c

Makefile

+7 −9
Original line number Original line Diff line number Diff line
@@ -336,15 +336,6 @@ endif 
export KBUILD_MODULES KBUILD_BUILTIN

export KBUILD_MODULES KBUILD_BUILTIN

export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD

export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD





ifneq ($(CC),)

ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)

COMPILER := clang

else

COMPILER := gcc

endif

export COMPILER

endif



# We need some generic definitions (do not try to remake the file).

# We need some generic definitions (do not try to remake the file).

scripts/Kbuild.include: ;

scripts/Kbuild.include: ;

include scripts/Kbuild.include

include scripts/Kbuild.include
@@ -671,6 +662,13 @@ endif 
endif

endif

KBUILD_CFLAGS += $(stackp-flag)

KBUILD_CFLAGS += $(stackp-flag)





ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)

COMPILER := clang

else

COMPILER := gcc

endif

export COMPILER



ifeq ($(COMPILER),clang)

ifeq ($(COMPILER),clang)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)

KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)