Index: uspace/app/cpptest/Makefile
===================================================================
--- uspace/app/cpptest/Makefile	(revision b57a3eeb719e9e5b79cc78424c1aa35aaecdb4d0)
+++ uspace/app/cpptest/Makefile	(revision 5b12dbb67a87898b6724f668cd572ab433512d1b)
@@ -29,8 +29,5 @@
 USPACE_PREFIX = ../..
 
-# TODO: Force linker to link libcpp by default when linking cpp apps?
-LIBS = cpp
-
-BINARY = cpptest
+CXX_BINARY = cpptest
 
 SOURCES = \