define build_target
-ifeq ($$($(1)_EMBEDDED_TGT),1)
+ifneq ($$($(1)_CROSS),)
#use embedded specific map flags
$(1)_MAP_FLAGS = $$(MAP_FLAGS_EMB)
#In embedded we need s19, hex and bin
$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).s19 $$(OUTDIR)/$(1).hex $$(OUTDIR)/$(1).bin
else
-#On Darwin architecture the assembly doesn't link correctly if this flag is setted.
+#On Darwin architecture the assembly doesn't link correctly if this flag is set.
ifeq ($(shell uname | grep -c "Darwin"),1)
-LIST_FLAGS = ""
-MAP_FLAGS = ""
-LDFLAGS = ""
+LIST_FLAGS := ""
+MAP_FLAGS := ""
+LDFLAGS := ""
endif
#use hosted specific map flags
$(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST)
$(1)_LD = $$($(1)_CROSS)$$(LD)
endif
+# Sometimes $(CC) is actually set to a C++ compiler in disguise, and it
+# would whine if we passed it C-only flags. Checking for the presence of
+# "++" in the name is a kludge that seems to work mostly.
+ifeq (++,$$(findstring ++,$$($(1)_CC)))
+ REAL_CFLAGS = $$(CXXFLAGS)
+else
+ REAL_CFLAGS = $$(CFLAGS)
+endif
+
# Compile: instructions to create assembler and/or object files from C source
$$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
$L "$(1): Compiling $$< (C)"
@$$(MKDIR_P) $$(dir $$@)
- $Q $$($(1)_CC) -c $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+ $Q $$($(1)_CC) -c $$(REAL_CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
# Compile: instructions to create assembler and/or object files from C++ source
$$($(1)_CXXOBJ) : $$(OBJDIR)/$(1)/%.o : %.cpp