summaryrefslogtreecommitdiffhomepage
path: root/digital/ucoolib/build
diff options
context:
space:
mode:
authorNicolas Schodet2012-12-08 09:21:37 +0100
committerNicolas Schodet2012-12-18 22:33:06 +0100
commite7e413823111ca05dd85f8b572f6c0ac22ffe354 (patch)
tree7187a77bcb0ea3ec7a1681d4e89772331b655ab7 /digital/ucoolib/build
parent278b2c24d6554a1fd73a425f79ab2877370b4fc8 (diff)
digital/ucoolib/build: unify TARGET_* defines
Diffstat (limited to 'digital/ucoolib/build')
-rw-r--r--digital/ucoolib/build/arch.mk2
-rw-r--r--digital/ucoolib/build/host.mk3
-rw-r--r--digital/ucoolib/build/stm32f4.mk4
3 files changed, 4 insertions, 5 deletions
diff --git a/digital/ucoolib/build/arch.mk b/digital/ucoolib/build/arch.mk
index 01b797f8..62f0687c 100644
--- a/digital/ucoolib/build/arch.mk
+++ b/digital/ucoolib/build/arch.mk
@@ -6,6 +6,8 @@
# Define standard commands.
define arch_cmds
+$1_TARGET_DEFS := -DTARGET_$1=1 $$($1_SUBTARGETS:%=-DTARGET_%=1)
+$1_CPPFLAGS += $$($1_TARGET_DEFS)
$1_CC := $$($1_PREFIX)gcc
$1_CXX := $$($1_PREFIX)g++
$1_OBJCOPY := $$($1_PREFIX)objcopy
diff --git a/digital/ucoolib/build/host.mk b/digital/ucoolib/build/host.mk
index b061efd1..a07d5258 100644
--- a/digital/ucoolib/build/host.mk
+++ b/digital/ucoolib/build/host.mk
@@ -2,8 +2,7 @@
#
# Rules for Host.
-host_CPPFLAGS := $(CPPFLAGS) $(host_DEFS) \
- -DTARGET_HOST=1
+host_CPPFLAGS := $(CPPFLAGS) $(host_DEFS)
host_CFLAGS := $(CFLAGS)
host_CXXFLAGS := $(sort $(host_CFLAGS) $(CXXFLAGS))
host_ASFLAGS := $(ASFLAGS)
diff --git a/digital/ucoolib/build/stm32f4.mk b/digital/ucoolib/build/stm32f4.mk
index b60d02db..ae899b53 100644
--- a/digital/ucoolib/build/stm32f4.mk
+++ b/digital/ucoolib/build/stm32f4.mk
@@ -17,9 +17,7 @@ endif
stm32f4_SUBTARGETS := stm32 arm newlib
stm32f4_CPPFLAGS := $(CPPFLAGS) $(stm32f4_DEFS) \
- -DSTM32F4 $(LIBOPENCM3_CPPFLAGS) \
- -DTARGET_STM32F4=1 \
- $(foreach sub,$(stm32f4_SUBTARGETS),-DTARGET_SUB_$(sub)=1)
+ -DSTM32F4 $(LIBOPENCM3_CPPFLAGS)
stm32f4_CFLAGS := $(CFLAGS) \
-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-Wl,--gc-sections -ffunction-sections