Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 8e2154e7a5f2efb72e5de559639e832fa5dd2d43)
+++ uspace/Makefile.common	(revision dfadf7e12488000faaba9ded5323aaf5b6be3a8a)
@@ -79,4 +79,11 @@
 	OUTPUTS += $(BINARY) $(BINARY).disasm
 	EXTRA_CLEAN += $(BINARY).map
+endif
+
+ifneq ($(CXX_BINARY),)
+	JOB = $(CXX_BINARY).job
+	TEST_BINARY = test-$(CXX_BINARY)
+	OUTPUTS += $(CXX_BINARY) $(CXX_BINARY).disasm
+	EXTRA_CLEAN += $(CXX_BINARY).map
 endif