diff -r ffe907153695 -r 9a0927683faa common/autoconf/build-performance.m4
--- a/common/autoconf/build-performance.m4	Thu Apr 14 19:55:39 2016 -0700
+++ b/common/autoconf/build-performance.m4	Mon Apr 18 15:39:46 2016 -0700
@@ -457,7 +457,7 @@
   AC_MSG_RESULT([$ENABLE_JAVAC_SERVER])
   AC_SUBST(ENABLE_JAVAC_SERVER)
 
-  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || "x$ENABLE_SJAVAC" = "xyes"; then
+  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || test "x$ENABLE_SJAVAC" = "xyes"; then
     # When using a server javac, the small client instances do not need much
     # resources.
     JAVA_FLAGS_JAVAC="$JAVA_FLAGS_SMALL"