--- a/common/autoconf/toolchain.m4	Fri Jul 08 12:17:09 2016 -0700
+++ b/common/autoconf/toolchain.m4	Sun Jul 10 22:00:03 2016 +0100
@@ -831,6 +831,8 @@
     BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
     BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
     BUILD_AR="$AR"
+    
+    TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_])
   fi
 
   AC_SUBST(BUILD_CC)