summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-04-27 07:50:11 +0000
committerTom Rini <trini@ti.com>2013-05-09 17:03:04 -0400
commitd642c467a071f074b991f9fea0c877c22462c9e9 (patch)
tree5d9fd59f7597aa5b0435ae7658f3f04a8560c654
parent4e779ad2e54e39d5343c8c83b4fc686a7bb16859 (diff)
downloadu-boot-imx-d642c467a071f074b991f9fea0c877c22462c9e9.zip
u-boot-imx-d642c467a071f074b991f9fea0c877c22462c9e9.tar.gz
u-boot-imx-d642c467a071f074b991f9fea0c877c22462c9e9.tar.bz2
build: Pull -DBUILD_TAG into separate ifdef
Currently the base setting for CFLAGS is split in two possibilities, one with -DBUILD_TAG appended at the end and one without, the rest of CFLAGS is the same in both cases. Change this so CFLAGS are always set and the -DBUILD_TAG is appended in separate ifdef. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Tom Rini <trini@ti.com> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--config.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/config.mk b/config.mk
index b427a4e..ddf350e 100644
--- a/config.mk
+++ b/config.mk
@@ -250,11 +250,10 @@ CPPFLAGS += -I$(TOPDIR)/include
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
-ifdef BUILD_TAG
-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes \
- -DBUILD_TAG='"$(BUILD_TAG)"'
-else
CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes
+
+ifdef BUILD_TAG
+CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"'
endif
CFLAGS_SSP := $(call cc-option,-fno-stack-protector)