Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 2e328c3f22289158f5d1889f4bacef60637d7da6)
+++ uspace/Makefile.common	(revision 65ee021c0fdcefebafcb43c7fc5dbc48e2d17206)
@@ -335,5 +335,5 @@
 ifneq ($(BINARY),)
 
-ifeq ($(findstring ".cpp", $($suffix $(SOURCES))),)
+ifneq ($(filter %.cpp %.cc %.cxx, $(SOURCES)),)
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)