unify HOST_CFLAGS and HOSTCFLAGS
The top build system sets up HOSTCFLAGS a bit and exports it, but other
places use HOST_CFLAGS instead. Unify the two as HOSTCFLAGS so that the
values stay in sync.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/tools/Makefile b/tools/Makefile
index 5c764bb..b5a1e39 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -36,18 +36,18 @@
# -multiply_defined suppress option to turn off this error.
#
-HOST_CFLAGS = -Wall
+HOSTCFLAGS = -Wall
HOST_LDFLAGS =
ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-HOST_CFLAGS += -traditional-cpp
+HOSTCFLAGS += -traditional-cpp
HOST_LDFLAGS += -multiply_defined suppress
else
-HOST_CFLAGS += -pedantic
+HOSTCFLAGS += -pedantic
endif
ifeq ($(HOSTOS),cygwin)
-HOST_CFLAGS += -ansi
+HOSTCFLAGS += -ansi
endif
#
@@ -148,7 +148,7 @@
-I $(SRCTREE)/tools \
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES
-CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O
+CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O
# No -pedantic switch to avoid libfdt compilation warnings
FIT_CFLAGS = -Wall $(CPPFLAGS) -O
@@ -227,7 +227,7 @@
$(MAKE) \
HOSTOS=$(HOSTOS) \
HOSTARCH=$(HOSTARCH) \
- HOST_CFLAGS="$(HOST_CFLAGS)" \
+ HOSTCFLAGS="$(HOSTCFLAGS)" \
HOST_LDFLAGS="$(HOST_LDFLAGS)" \
-C $$dir || exit 1 ; \
done
diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index c44cc8a..0a5687d 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -38,7 +38,7 @@
# Use native tools and options
#
CPPFLAGS = -I$(BFD_ROOT_DIR)/include
-CFLAGS = $(HOST_CFLAGS) -O $(CPPFLAGS)
+CFLAGS = $(HOSTCFLAGS) -O $(CPPFLAGS)
CC = $(HOSTCC)
MAKEDEPEND = makedepend
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 04ab31a..59b928c 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -19,7 +19,7 @@
include $(TOPDIR)/config.mk
-HOST_CFLAGS = -Wall -pedantic
+HOSTCFLAGS = -Wall -pedantic
# Generated executable files
BIN_FILES-y += imls
@@ -57,7 +57,7 @@
-I $(SRCTREE)/libfdt \
-I $(SRCTREE)/tools \
-DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
-CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O
+CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O
# No -pedantic switch to avoid libfdt compilation warnings
FIT_CFLAGS = -Wall $(CPPFLAGS) -O