X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=1729fbf829511b9f133881973d646cfc031203b8;hb=37df46aa8f8cb8e89b92c6c8de6a047fcaad9e37;hp=d3cde94b540fc3b68d69075184575c3477e071f7;hpb=85aa7118467ccb8abacc8ede41dcd5011ab84fad;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index d3cde94b..1729fbf8 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -67,17 +67,17 @@ check:
 
 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)
@@ -128,11 +128,20 @@ else
 $(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