Commit 9aef7388 authored by Mike Frysinger's avatar Mike Frysinger Committed by Wolfgang Denk
Browse files

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: default avatarMike Frysinger <vapier@gentoo.org>
parent 2e9393f5
......@@ -429,7 +429,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
@$(XECHO) Generating $@ ; \
set -e ; \
: Generate the dependancies ; \
$(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \
$(CC) -x c -DDO_DEPS_ONLY -M $(HOSTCFLAGS) $(CPPFLAGS) \
-MQ $(obj)include/autoconf.mk include/common.h > $@
$(obj)include/autoconf.mk: $(obj)include/config.h
......
......@@ -30,5 +30,5 @@
TEXT_BASE = 0xFE000000
PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads
HOST_CFLAGS += -I$(TOPDIR)/board/fads
HOSTCFLAGS += -I$(TOPDIR)/board/fads
HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads
......@@ -42,7 +42,7 @@ LOAD_ADDR = 0x10400000
LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds
lnk = $(if $(obj),$(obj),.)
HOST_CFLAGS = -Wall -pedantic -I$(TOPDIR)/include
HOSTCFLAGS = -Wall -pedantic -I$(TOPDIR)/include
all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
$(obj)crcek.srec $(obj)crcek.bin $(obj)crcit
......@@ -70,13 +70,13 @@ $(obj)crcek.bin: $(obj)crcek.srec
$(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null
$(obj)crcit: $(obj)crcit.o $(obj)crc32.o
$(HOSTCC) $(HOST_CFLAGS) -o $@ $^
$(HOSTCC) $(HOSTCFLAGS) -o $@ $^
$(obj)crcit.o: crcit.c
$(HOSTCC) $(HOST_CFLAGS) -o $@ -c $<
$(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
$(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c
$(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $<
$(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -o $@ -c $<
clean:
rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \
......
......@@ -31,5 +31,5 @@
#TEXT_BASE = 0xFE000000
TEXT_BASE = 0xFFF00000
PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920
HOST_CFLAGS += -I$(TOPDIR)/board/spc1920
HOSTCFLAGS += -I$(TOPDIR)/board/spc1920
HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920
......@@ -30,7 +30,7 @@ endif
INCS := -I../common -I../xilinx_enet -I../xilinx_iic
CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS)
HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a
......
......@@ -31,7 +31,7 @@ endif
INCS :=
CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS)
HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a
......
......@@ -31,7 +31,7 @@ endif
INCS :=
CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS)
HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a
......
......@@ -27,7 +27,7 @@ LIB := $(obj)libnpe.a
LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
CFLAGS += $(LOCAL_CFLAGS)
HOST_CFLAGS += $(LOCAL_CFLAGS)
HOSTCFLAGS += $(LOCAL_CFLAGS)
COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \
miiphy.o \
......
......@@ -22,7 +22,7 @@ EXTRA_CFLAGS += -I. -I./include -I$(TOPDIR)/include \
-D__PPC__ -D__BIG_ENDIAN__
CFLAGS += $(EXTRA_CFLAGS)
HOST_CFLAGS += $(EXTRA_CFLAGS)
HOSTCFLAGS += $(EXTRA_CFLAGS)
all: $(LIB)
......
......@@ -90,7 +90,7 @@ endif
EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF)
CFLAGS += $(EXTRA_CFLAGS)
HOST_CFLAGS += $(EXTRA_CFLAGS)
HOSTCFLAGS += $(EXTRA_CFLAGS)
all: $(LIB)
......
......@@ -29,7 +29,7 @@ $(obj).depend: $(src)Makefile $(TOPDIR)/config.mk $(SRCS)
@rm -f $@
@for f in $(SRCS); do \
g=`basename $$f | sed -e 's/\(.*\)\.\w/\1.o/'`; \
$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
$(CC) -M $(HOSTCFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
done
#########################################################################
......@@ -36,18 +36,18 @@ TOOLSUBDIRS =
# -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 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \
-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 @@ else
$(MAKE) \
HOSTOS=$(HOSTOS) \
HOSTARCH=$(HOSTARCH) \
HOST_CFLAGS="$(HOST_CFLAGS)" \
HOSTCFLAGS="$(HOSTCFLAGS)" \
HOST_LDFLAGS="$(HOST_LDFLAGS)" \
-C $$dir || exit 1 ; \
done
......
......@@ -38,7 +38,7 @@ BINS := $(addprefix $(obj),$(BINS))
# Use native tools and options
#
CPPFLAGS = -I$(BFD_ROOT_DIR)/include
CFLAGS = $(HOST_CFLAGS) -O $(CPPFLAGS)
CFLAGS = $(HOSTCFLAGS) -O $(CPPFLAGS)
CC = $(HOSTCC)
MAKEDEPEND = makedepend
......
......@@ -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 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \
-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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment