diff --git a/ChangeLog b/ChangeLog
index 59e8feb40d..30785eb1c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-04  Roland McGrath  <roland@hack.frob.com>
+
+	* Makefile ($(objpfx)c++-types-check.out): Fix conditionalization
+	to test for empty $(CXX) rather than $(CXX) of "no".
+
 2016-03-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/Makefile (sysdep_noprof): Add comments.
diff --git a/Makefile b/Makefile
index 7fc92ae3a2..9c6918d995 100644
--- a/Makefile
+++ b/Makefile
@@ -252,8 +252,8 @@ tests-clean:
 	@$(MAKE) subdir_testclean no_deps=t
 
 tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
-ifneq ($(CXX),no)
 
+ifneq (,$(CXX))
 vpath c++-types.data $(+sysdep_dirs)
 
 $(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh