62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
|
From a6faf06c7da9ea06ca23c3a50215860f5d83b3bd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laura Abbott <labbott@redhat.com>
|
||
|
|
Date: Thu, 5 Jul 2018 14:43:37 -0700
|
||
|
|
Subject: [PATCHv2 4/7] treewide: Rename HOSTCXXFLAGS to KBUILD_HOSTCXXFLAGS
|
||
|
|
To: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||
|
|
To: Josh Poimboeuf <jpoimboe@redhat.com>
|
||
|
|
To: Jiri Olsa <jolsa@kernel.org>
|
||
|
|
Cc: linux-kbuild@vger.kernel.org
|
||
|
|
Cc: linux-kernel@vger.kernel.org
|
||
|
|
Cc: Robin Jarry <robin.jarry@6wind.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>
|
||
|
|
---
|
||
|
|
v2: Dropped name change for individual files (still HOSTCXXFLAGS_foo)
|
||
|
|
---
|
||
|
|
Makefile | 4 ++--
|
||
|
|
scripts/Makefile.host | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 1feec222f3c1..857ccd28dc36 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 09f00dae21fe..455d85aa1d37 100644
|
||
|
|
--- a/scripts/Makefile.host
|
||
|
|
+++ b/scripts/Makefile.host
|
||
|
|
@@ -64,7 +64,7 @@ host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
|
||
|
|
|
||
|
|
_hostc_flags = $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS) \
|
||
|
|
$(HOSTCFLAGS_$(basetarget).o)
|
||
|
|
-_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
|
||
|
|
+_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
|
||
|
|
$(HOSTCXXFLAGS_$(basetarget).o)
|
||
|
|
|
||
|
|
ifeq ($(KBUILD_SRC),)
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|