Fixed selection of linker command

diff --git a/snippets/Makefile.rules.test b/snippets/Makefile.rules.test
index 0a14ffd3a2c7929d001d3aa896bd00b6064e6967..1f819a0b2d70f0f89600e22d30578fc307e263d7 100644 (file)
--- a/snippets/Makefile.rules.test
+++ b/snippets/Makefile.rules.test
@@ -114,7 +114,7 @@ idl_src_cmd = $(IDL_COMPILER) $(IDL_FLAGS) $($(1)_IDLFLAGS) $$<
 
 # TODO: Implement CMETRIC
 
-_linker = $(if $(call c++sources,$($(1)_SOURCES)),$(CXX),$(CC))
+_linker = $(if $(call c++sources,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(CXX),$(CC))
 _map_file = $(USER_OBJS_DIR)/$(1).exe.map
 _dep_file = $(USER_OBJS_DIR)/$(1).exe.d
 program_cmd = set -e; \

diff --git a/snippets/cprog.omk b/snippets/cprog.omk
index 663015240a1d4ffa7b58d36131cca13455c88d64..29420db159a7634096f0e6eecc6b031ca440c2e4 100644 (file)
--- a/snippets/cprog.omk
+++ b/snippets/cprog.omk
@@ -1,10 +1,10 @@
 
-##############
-# C programs #
-##############
+##################
+# C/C++ programs #
+##################
 
 c++ext = cc C cxx cpp
-c++sources = $(foreach ext,$(c++ext),$(filter %.$(ext),$(1)))
+c++sources = $(strip $(foreach ext,$(c++ext),$(filter %.$(ext),$(1))))
 
 ###
 # template_variables - variables common to program, libraries, ...