Re: [PATCH 4/7] treewide: Rename HOSTCXXFLAGS to KBUILD_HOSTCXXFLAGS

Masahiro Yamada
2018-07-08T02:31:55Z

2018-07-07 10:07 GMT+09:00 Laura Abbott <labbott@redhat.com>:
>
> In preparation for enabling command line CXXFLAGS, re-name HOSTCXXFLAGS to
> KBUILD_HOSTCXXFLAGS as the internal use only flags. This should not have any
> visible effects.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> Makefile | 4 ++--
> scripts/Makefile.host | 4 ++--
> scripts/kconfig/Makefile | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 16cab22b1f40..9c3f1864d678 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -361,7 +361,7 @@ HOSTCC = gcc
> HOSTCXX = g++
> KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \
> -fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS)
> -HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
> +KBUILD_HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS)
> HOSTLDFLAGS := $(HOST_LFS_LDFLAGS)
> HOST_LOADLIBES := $(HOST_LFS_LIBS)
>
> @@ -432,7 +432,7 @@ GCC_PLUGINS_CFLAGS :=
> export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
> export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
> export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
> -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
> +export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
>
> export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
> export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
> diff --git a/scripts/Makefile.host b/scripts/Makefile.host
> index 7a4c90f2b0ce..1c153cc5b530 100644
> --- a/scripts/Makefile.host
> +++ b/scripts/Makefile.host
> @@ -64,8 +64,8 @@ host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
>
> _hostc_flags = $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS) \
> $(KBUILD_HOSTCFLAGS_$(basetarget).o)
> -_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
> - $(HOSTCXXFLAGS_$(basetarget).o)
> +_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
> + $(KBUILD_HOSTCXXFLAGS_$(basetarget).o)
>
> ifeq ($(KBUILD_SRC),)
> __hostc_flags = $(_hostc_flags)
> diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
> index f98a22618e1f..37605d92c597 100644
> --- a/scripts/kconfig/Makefile
> +++ b/scripts/kconfig/Makefile
> @@ -192,7 +192,7 @@ qconf-cxxobjs := qconf.o
> qconf-objs := zconf.tab.o
>
> HOSTLOADLIBES_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
> -HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
> +KBUILD_HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)

Please keep HOSTCXXFLAGS_<file>.o as-is.

--
Best Regards
Masahiro Yamada