diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 4ca7da594b79939eebe5541b27fb1ab55d688e37..3cc2238ba636e8b295483096d9b0b903abe8c9c8 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-14  Frank Ch. Eigler  <fche@redhat.com>
+
+	PR libmudflap/21094
+	* testsuite/libmudflap.c++/*.exp: Assert build tree g++.
+
 2005-06-14  Frank Ch. Eigler  <fche@redhat.com>
 
 	PR mudflap/22064
diff --git a/libmudflap/testsuite/libmudflap.c++/c++frags.exp b/libmudflap/testsuite/libmudflap.c++/c++frags.exp
index 1ac24adbe929bfd701c928ddc276984dce6e3ba5..0b2774360b7ce0aa11d1d2d76217d2dd7ff7401c 100644
--- a/libmudflap/testsuite/libmudflap.c++/c++frags.exp
+++ b/libmudflap/testsuite/libmudflap.c++/c++frags.exp
@@ -1,5 +1,9 @@
 
 libmudflap-init c++
+if {$cxx == "g++"} then {
+    unsupported "g++ not found"
+    return
+}
 
 dg-init
 
diff --git a/libmudflap/testsuite/libmudflap.c++/ctors.exp b/libmudflap/testsuite/libmudflap.c++/ctors.exp
index 5d4f1efff61fd1bc7e4d06948e06c28b24395c29..ceb9fb70ffaebcac0cc4887196ab43ab6b835527 100644
--- a/libmudflap/testsuite/libmudflap.c++/ctors.exp
+++ b/libmudflap/testsuite/libmudflap.c++/ctors.exp
@@ -1,5 +1,9 @@
 
 libmudflap-init c++
+if {$cxx == "g++"} then {
+    unsupported "g++ not found"
+    return
+}
 
 dg-init