From 4cb1d1cb184dacf99b229f9412b81fd7c72e77b5 Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 4 Aug 2008 11:16:06 +0000 Subject: [PATCH] Avoid g++ whining messages when we pass C options to it git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1534 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/rules.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bertos/rules.mk b/bertos/rules.mk index d3cde94b..eea2625f 100644 --- a/bertos/rules.mk +++ b/bertos/rules.mk @@ -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 -- 2.25.1