From: Sedat Dilek <sedat.dilek@gmail.com>
To: Yonghong Song <yhs@fb.com>
Cc: bpf@vger.kernel.org, Andrii Nakryiko <andrii@kernel.org>,
Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
kernel-team@fb.com, Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: [PATCH bpf-next 2/5] tools: allow proper CC/CXX/... override with LLVM=1 in Makefile.include
Date: Sun, 11 Apr 2021 12:24:15 +0200 [thread overview]
Message-ID: <CA+icZUVztyjfRrN1HweGPz6ASjVAEs7cSf72-Fbjm2H4FQBZ0Q@mail.gmail.com> (raw)
In-Reply-To: <20210410164935.769789-1-yhs@fb.com>
On Sat, Apr 10, 2021 at 6:49 PM Yonghong Song <yhs@fb.com> wrote:
>
> selftests/bpf/Makefile includes tools/scripts/Makefile.include.
> With the following command
> make -j60 LLVM=1 LLVM_IAS=1 <=== compile kernel
> make -j60 -C tools/testing/selftests/bpf LLVM=1 LLVM_IAS=1 V=1
> some files are still compiled with gcc. This patch
> fixed the case if CC/AR/LD/CXX/STRIP is allowed to be
> overridden, it will be written to clang/llvm-ar/..., instead of
> gcc binaries. The definition of CC_NO_CLANG is also relocated
> to the place after the above CC is defined.
>
> Cc: Sedat Dilek <sedat.dilek@gmail.com>
> Signed-off-by: Yonghong Song <yhs@fb.com>
> ---
> tools/scripts/Makefile.include | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
> index a402f32a145c..91130648d8e6 100644
> --- a/tools/scripts/Makefile.include
> +++ b/tools/scripts/Makefile.include
> @@ -39,8 +39,6 @@ EXTRA_WARNINGS += -Wundef
> EXTRA_WARNINGS += -Wwrite-strings
> EXTRA_WARNINGS += -Wformat
>
> -CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
> -
> # Makefiles suck: This macro sets a default value of $(2) for the
> # variable named by $(1), unless the variable has been set by
> # environment or command line. This is necessary for CC and AR
> @@ -52,12 +50,22 @@ define allow-override
> $(eval $(1) = $(2)))
> endef
>
> +ifneq ($(LLVM),)
> +$(call allow-override,CC,clang)
> +$(call allow-override,AR,llvm-ar)
> +$(call allow-override,LD,ld.lld)
> +$(call allow-override,CXX,clang++)
> +$(call allow-override,STRIP,llvm-strip)
Use here $(CROSS_COMPILE) prefix like below for people using an LLVM
cross-toolchain?
- Sedat -
> +else
> # Allow setting various cross-compile vars or setting CROSS_COMPILE as a prefix.
> $(call allow-override,CC,$(CROSS_COMPILE)gcc)
> $(call allow-override,AR,$(CROSS_COMPILE)ar)
> $(call allow-override,LD,$(CROSS_COMPILE)ld)
> $(call allow-override,CXX,$(CROSS_COMPILE)g++)
> $(call allow-override,STRIP,$(CROSS_COMPILE)strip)
> +endif
> +
> +CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
>
> ifneq ($(LLVM),)
> HOSTAR ?= llvm-ar
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-04-11 10:24 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-10 16:49 [PATCH bpf-next 0/5] support build selftests/bpf with clang Yonghong Song
2021-04-10 16:49 ` [PATCH bpf-next 1/5] selftests: set CC to clang in lib.mk if LLVM is set Yonghong Song
2021-04-11 10:22 ` Sedat Dilek
2021-04-11 16:51 ` Yonghong Song
2021-04-11 17:10 ` Sedat Dilek
2021-04-10 16:49 ` [PATCH bpf-next 2/5] tools: allow proper CC/CXX/... override with LLVM=1 in Makefile.include Yonghong Song
2021-04-11 10:24 ` Sedat Dilek [this message]
2021-04-11 16:52 ` Yonghong Song
2021-04-10 16:49 ` [PATCH bpf-next 3/5] selftests/bpf: fix test_cpp compilation failure with clang Yonghong Song
2021-04-11 10:47 ` Sedat Dilek
2021-04-11 17:20 ` Yonghong Song
2021-04-11 17:31 ` Sedat Dilek
2021-04-11 19:08 ` Yonghong Song
2021-04-12 4:47 ` Sedat Dilek
2021-04-12 5:42 ` Yonghong Song
2021-04-12 6:06 ` Sedat Dilek
2021-04-12 14:15 ` Yonghong Song
2021-04-13 4:32 ` Andrii Nakryiko
2021-04-13 6:12 ` Yonghong Song
2021-04-13 17:50 ` Andrii Nakryiko
2021-04-10 16:49 ` [PATCH bpf-next 4/5] selftests/bpf: silence clang compilation warnings Yonghong Song
2021-04-11 11:12 ` Sedat Dilek
2021-04-11 17:40 ` Yonghong Song
2021-04-10 16:49 ` [PATCH bpf-next 5/5] bpftool: fix a clang compilation warning Yonghong Song
2021-04-11 11:05 ` Sedat Dilek
2021-04-11 17:24 ` Yonghong Song
2021-04-10 17:23 ` [PATCH bpf-next 0/5] support build selftests/bpf with clang Alexei Starovoitov
2021-04-10 17:38 ` Yonghong Song
2021-04-10 19:19 ` Sedat Dilek
2021-04-11 16:46 ` Yonghong Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+icZUVztyjfRrN1HweGPz6ASjVAEs7cSf72-Fbjm2H4FQBZ0Q@mail.gmail.com \
--to=sedat.dilek@gmail.com \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=kernel-team@fb.com \
--cc=ndesaulniers@google.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).