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>
This commit is contained in:
Mike Frysinger 2009-07-19 15:17:03 -04:00 committed by Wolfgang Denk
parent 2e9393f500
commit 9aef738885
14 changed files with 23 additions and 23 deletions

View File

@ -429,7 +429,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
@$(XECHO) Generating $@ ; \ @$(XECHO) Generating $@ ; \
set -e ; \ set -e ; \
: Generate the dependancies ; \ : 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 > $@ -MQ $(obj)include/autoconf.mk include/common.h > $@
$(obj)include/autoconf.mk: $(obj)include/config.h $(obj)include/autoconf.mk: $(obj)include/config.h

View File

@ -30,5 +30,5 @@
TEXT_BASE = 0xFE000000 TEXT_BASE = 0xFE000000
PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads
HOST_CFLAGS += -I$(TOPDIR)/board/fads HOSTCFLAGS += -I$(TOPDIR)/board/fads
HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads

View File

@ -42,7 +42,7 @@ LOAD_ADDR = 0x10400000
LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds
lnk = $(if $(obj),$(obj),.) 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 \ all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
$(obj)crcek.srec $(obj)crcek.bin $(obj)crcit $(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 $(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null
$(obj)crcit: $(obj)crcit.o $(obj)crc32.o $(obj)crcit: $(obj)crcit.o $(obj)crc32.o
$(HOSTCC) $(HOST_CFLAGS) -o $@ $^ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
$(obj)crcit.o: crcit.c $(obj)crcit.o: crcit.c
$(HOSTCC) $(HOST_CFLAGS) -o $@ -c $< $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
$(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c $(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c
$(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $< $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -o $@ -c $<
clean: clean:
rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \ rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \

View File

@ -31,5 +31,5 @@
#TEXT_BASE = 0xFE000000 #TEXT_BASE = 0xFE000000
TEXT_BASE = 0xFFF00000 TEXT_BASE = 0xFFF00000
PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920
HOST_CFLAGS += -I$(TOPDIR)/board/spc1920 HOSTCFLAGS += -I$(TOPDIR)/board/spc1920
HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920

View File

@ -30,7 +30,7 @@ endif
INCS := -I../common -I../xilinx_enet -I../xilinx_iic INCS := -I../common -I../xilinx_enet -I../xilinx_iic
CFLAGS += $(INCS) CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS) HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a

View File

@ -31,7 +31,7 @@ endif
INCS := INCS :=
CFLAGS += $(INCS) CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS) HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a

View File

@ -31,7 +31,7 @@ endif
INCS := INCS :=
CFLAGS += $(INCS) CFLAGS += $(INCS)
HOST_CFLAGS += $(INCS) HOSTCFLAGS += $(INCS)
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a

View File

@ -27,7 +27,7 @@ LIB := $(obj)libnpe.a
LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
CFLAGS += $(LOCAL_CFLAGS) CFLAGS += $(LOCAL_CFLAGS)
HOST_CFLAGS += $(LOCAL_CFLAGS) HOSTCFLAGS += $(LOCAL_CFLAGS)
COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \ COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \
miiphy.o \ miiphy.o \

View File

@ -22,7 +22,7 @@ EXTRA_CFLAGS += -I. -I./include -I$(TOPDIR)/include \
-D__PPC__ -D__BIG_ENDIAN__ -D__PPC__ -D__BIG_ENDIAN__
CFLAGS += $(EXTRA_CFLAGS) CFLAGS += $(EXTRA_CFLAGS)
HOST_CFLAGS += $(EXTRA_CFLAGS) HOSTCFLAGS += $(EXTRA_CFLAGS)
all: $(LIB) all: $(LIB)

View File

@ -90,7 +90,7 @@ endif
EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF) EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF)
CFLAGS += $(EXTRA_CFLAGS) CFLAGS += $(EXTRA_CFLAGS)
HOST_CFLAGS += $(EXTRA_CFLAGS) HOSTCFLAGS += $(EXTRA_CFLAGS)
all: $(LIB) all: $(LIB)

View File

@ -29,7 +29,7 @@ $(obj).depend: $(src)Makefile $(TOPDIR)/config.mk $(SRCS)
@rm -f $@ @rm -f $@
@for f in $(SRCS); do \ @for f in $(SRCS); do \
g=`basename $$f | sed -e 's/\(.*\)\.\w/\1.o/'`; \ 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 done
######################################################################### #########################################################################

View File

@ -36,18 +36,18 @@ TOOLSUBDIRS =
# -multiply_defined suppress option to turn off this error. # -multiply_defined suppress option to turn off this error.
# #
HOST_CFLAGS = -Wall HOSTCFLAGS = -Wall
HOST_LDFLAGS = HOST_LDFLAGS =
ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc) ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
HOST_CFLAGS += -traditional-cpp HOSTCFLAGS += -traditional-cpp
HOST_LDFLAGS += -multiply_defined suppress HOST_LDFLAGS += -multiply_defined suppress
else else
HOST_CFLAGS += -pedantic HOSTCFLAGS += -pedantic
endif endif
ifeq ($(HOSTOS),cygwin) ifeq ($(HOSTOS),cygwin)
HOST_CFLAGS += -ansi HOSTCFLAGS += -ansi
endif endif
# #
@ -148,7 +148,7 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES -D__KERNEL_STRICT_NAMES
CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O
# No -pedantic switch to avoid libfdt compilation warnings # No -pedantic switch to avoid libfdt compilation warnings
FIT_CFLAGS = -Wall $(CPPFLAGS) -O FIT_CFLAGS = -Wall $(CPPFLAGS) -O
@ -227,7 +227,7 @@ else
$(MAKE) \ $(MAKE) \
HOSTOS=$(HOSTOS) \ HOSTOS=$(HOSTOS) \
HOSTARCH=$(HOSTARCH) \ HOSTARCH=$(HOSTARCH) \
HOST_CFLAGS="$(HOST_CFLAGS)" \ HOSTCFLAGS="$(HOSTCFLAGS)" \
HOST_LDFLAGS="$(HOST_LDFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \
-C $$dir || exit 1 ; \ -C $$dir || exit 1 ; \
done done

View File

@ -38,7 +38,7 @@ BINS := $(addprefix $(obj),$(BINS))
# Use native tools and options # Use native tools and options
# #
CPPFLAGS = -I$(BFD_ROOT_DIR)/include CPPFLAGS = -I$(BFD_ROOT_DIR)/include
CFLAGS = $(HOST_CFLAGS) -O $(CPPFLAGS) CFLAGS = $(HOSTCFLAGS) -O $(CPPFLAGS)
CC = $(HOSTCC) CC = $(HOSTCC)
MAKEDEPEND = makedepend MAKEDEPEND = makedepend

View File

@ -19,7 +19,7 @@
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
HOST_CFLAGS = -Wall -pedantic HOSTCFLAGS = -Wall -pedantic
# Generated executable files # Generated executable files
BIN_FILES-y += imls BIN_FILES-y += imls
@ -57,7 +57,7 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \
-I $(SRCTREE)/libfdt \ -I $(SRCTREE)/libfdt \
-I $(SRCTREE)/tools \ -I $(SRCTREE)/tools \
-DUSE_HOSTCC -D__KERNEL_STRICT_NAMES -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O
# No -pedantic switch to avoid libfdt compilation warnings # No -pedantic switch to avoid libfdt compilation warnings
FIT_CFLAGS = -Wall $(CPPFLAGS) -O FIT_CFLAGS = -Wall $(CPPFLAGS) -O