| Message ID | 20241009102821.2675718-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: refactor cc-option-yn, cc-disable-warning, rust-option-yn macros | expand |
On Wed, Oct 9, 2024 at 12:28 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > cc-option-yn and cc-disable-warning duplicate the compile command seen > a few lines above. These can be defined based on cc-option. > > I also refactored rustc-option-yn in the same way, although there are > currently no users of it. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > This avoids applying similar fixes to rustc-option and rustc-option-yn. Reviewed-by: Alice Ryhl <aliceryhl@google.com>
On Wed, Oct 09, 2024 at 07:27:37PM +0900, Masahiro Yamada wrote: > cc-option-yn and cc-disable-warning duplicate the compile command seen > a few lines above. These can be defined based on cc-option. > > I also refactored rustc-option-yn in the same way, although there are > currently no users of it. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Neat! Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > > This avoids applying similar fixes to rustc-option and rustc-option-yn. > > scripts/Makefile.compiler | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/scripts/Makefile.compiler b/scripts/Makefile.compiler > index 057305eae85c..73d611d383b2 100644 > --- a/scripts/Makefile.compiler > +++ b/scripts/Makefile.compiler > @@ -53,13 +53,11 @@ cc-option = $(call __cc-option, $(CC),\ > > # cc-option-yn > # Usage: flag := $(call cc-option-yn,-march=winchip-c6) > -cc-option-yn = $(call try-run,\ > - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n) > +cc-option-yn = $(if $(call cc-option,$1),y,n) > > # cc-disable-warning > # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable) > -cc-disable-warning = $(call try-run,\ > - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) > +cc-disable-warning = $(if $(call cc-option,-W$(strip $1)),-Wno-$(strip $1)) > > # gcc-min-version > # Usage: cflags-$(call gcc-min-version, 70100) += -foo > @@ -85,5 +83,4 @@ rustc-option = $(call __rustc-option, $(RUSTC),\ > > # rustc-option-yn > # Usage: flag := $(call rustc-option-yn,-Cinstrument-coverage) > -rustc-option-yn = $(call try-run,\ > - $(RUSTC) $(KBUILD_RUSTFLAGS) $(1) --crate-type=rlib /dev/null --out-dir=$$TMPOUT -o "$$TMP",y,n) > +rustc-option-yn = $(if $(call rustc-option,$1),y,n) > -- > 2.43.0 >
On Wed, Oct 9, 2024 at 12:28 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > cc-option-yn and cc-disable-warning duplicate the compile command seen > a few lines above. These can be defined based on cc-option. > > I also refactored rustc-option-yn in the same way, although there are > currently no users of it. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Applied to `rust-fixes` as a prerequisite for the `rustc-option` fix -- thanks everyone! Cheers, Miguel
diff --git a/scripts/Makefile.compiler b/scripts/Makefile.compiler index 057305eae85c..73d611d383b2 100644 --- a/scripts/Makefile.compiler +++ b/scripts/Makefile.compiler @@ -53,13 +53,11 @@ cc-option = $(call __cc-option, $(CC),\ # cc-option-yn # Usage: flag := $(call cc-option-yn,-march=winchip-c6) -cc-option-yn = $(call try-run,\ - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n) +cc-option-yn = $(if $(call cc-option,$1),y,n) # cc-disable-warning # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable) -cc-disable-warning = $(call try-run,\ - $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) +cc-disable-warning = $(if $(call cc-option,-W$(strip $1)),-Wno-$(strip $1)) # gcc-min-version # Usage: cflags-$(call gcc-min-version, 70100) += -foo @@ -85,5 +83,4 @@ rustc-option = $(call __rustc-option, $(RUSTC),\ # rustc-option-yn # Usage: flag := $(call rustc-option-yn,-Cinstrument-coverage) -rustc-option-yn = $(call try-run,\ - $(RUSTC) $(KBUILD_RUSTFLAGS) $(1) --crate-type=rlib /dev/null --out-dir=$$TMPOUT -o "$$TMP",y,n) +rustc-option-yn = $(if $(call rustc-option,$1),y,n)
cc-option-yn and cc-disable-warning duplicate the compile command seen a few lines above. These can be defined based on cc-option. I also refactored rustc-option-yn in the same way, although there are currently no users of it. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- This avoids applying similar fixes to rustc-option and rustc-option-yn. scripts/Makefile.compiler | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)