3 files changed, 12 insertions, 2 deletions
diff --git a/c/src/tests/libtests/Makefile.in b/c/src/tests/libtests/Makefile.in
index c6875734a0..cce700a3ad 100644
--- a/c/src/tests/libtests/Makefile.in
+++ b/c/src/tests/libtests/Makefile.in
@@ -10,4 +10,8 @@ VPATH=@srcdir@
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/directory.cfg
 
-SUB_DIRS=cpuuse rtmonuse malloctest stackchk
+# We only build the tests for the rtems++ library if HAS_CPLUSPLUS was defined
+LIBRTEMSCPLUSPLUS_yes_V = rtems++
+LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
+
+SUB_DIRS=cpuuse rtmonuse malloctest stackchk $(LIBRTEMSCPLUSPLUS)
diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in
index 75529f072b..69e164bbc7 100644
--- a/c/src/tests/samples/cdtest/Makefile.in
+++ b/c/src/tests/samples/cdtest/Makefile.in
@@ -41,7 +41,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg
 #
 
 DEFINES  +=
-CPPFLAGS +=
+CPPFLAGS += -I$(LIBCC_INCLUDE)
 CFLAGS   +=
 
 LD_PATHS  +=
diff --git a/c/src/tests/samples/cdtest/main.cc b/c/src/tests/samples/cdtest/main.cc
index d55f96e9f0..e7b3cd02b3 100644
--- a/c/src/tests/samples/cdtest/main.cc
+++ b/c/src/tests/samples/cdtest/main.cc
@@ -21,7 +21,9 @@
 
 #include <rtems.h>
 #include <stdio.h>
+#ifdef RTEMS_TEST_IO_STREAM
 #include <iostream.h>
+#endif
 
 extern "C" {
 extern rtems_task main_task(rtems_task_argument);
@@ -108,7 +110,11 @@ cdtest(void)
     A bar, blech, blah;
     B bleak;
 
+#ifdef RTEMS_TEST_IO_STREAM
     cout << "Testing a C++ I/O stream" << endl;
+#else
+    printf("IO Stream not tested\n");
+#endif
 
     bar = blech;
 }