Index: uspace/app/cpptest/Makefile
===================================================================
--- uspace/app/cpptest/Makefile	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
+++ uspace/app/cpptest/Makefile	(revision 74aee0c2cfa336e598f984410b3c110b20bd0a5a)
@@ -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 = \