diff --git a/Makefile b/Makefile
index 70afc2330..91f067ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,7 @@ clang_setup:
 clang_plugin: clang_setup
 	$(QUIET)$(call silent_on_success,Building clang plugin,\
 	$(MAKE) -C $(FCP_DIR)/libtooling all \
-	  CC=$(CC) CXX=$(CXX) \
+	  CC="$(CC)" CXX="$(CXX)" \
 	  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	  CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
 	  LOCAL_CLANG=$(CLANG_PREFIX)/bin/clang \
diff --git a/configure.ac b/configure.ac
index 265c9b2a5..4bad225f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ if test "x$enable_c_analyzers" = "xyes"; then
   AC_PROG_CXX(clang++ g++)
   # AC_PROG_CXX doesn't set CXX to "no" in case of failure (I have no words...); from the manual:
   # "If none of those checks succeed, then as a last resort set CXX to g++. "
-  AS_IF([command -v "$CXX" > /dev/null], [], [AC_MSG_ERROR([no C++ compiler found])])
+  AS_IF([$CXX --version > /dev/null], [], [AC_MSG_ERROR([no C++ compiler found])])
 
   dnl clang wants either clang version >= 3.1 or gcc version >= 4.7.2 to
   dnl compile itself
diff --git a/facebook-clang-plugins b/facebook-clang-plugins
index 2348f2ae2..2c6cbaf41 160000
--- a/facebook-clang-plugins
+++ b/facebook-clang-plugins
@@ -1 +1 @@
-Subproject commit 2348f2ae27ea36322b3f5efacb83a11b318be844
+Subproject commit 2c6cbaf4188192795af55b472882c09975e65901