Fix failures in programs-cxxflags tests

diff --git a/snippets/gcc.omk b/snippets/gcc.omk
index dc24bc13ba194d25145552c1f59761b0367162c1..fc16cdb55c3cbbe9205598239fa15c6764a13a1c 100644 (file)
--- a/snippets/gcc.omk
+++ b/snippets/gcc.omk
@@ -70,7 +70,7 @@ c_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS)
 
 cc_o_COMPILE = $$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS)
+       $(CPPFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $$(CFLAGS)
 
 S_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS) $(ASFLAGS)

diff --git a/snippets/rtems.omk b/snippets/rtems.omk
index b7dbb5fec870433002ea97574039589c129048f2..7bc0abd77abee3d767d70e932b653dfa8ca92d44 100644 (file)
--- a/snippets/rtems.omk
+++ b/snippets/rtems.omk
@@ -112,7 +112,7 @@ c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER