--- a/common/autoconf/spec.gmk.in	Fri May 06 06:23:29 2016 -0700
+++ b/common/autoconf/spec.gmk.in	Tue May 03 23:49:27 2016 +0300
@@ -232,6 +232,9 @@
 VALID_JVM_FEATURES := @VALID_JVM_FEATURES@
 VALID_JVM_VARIANTS := @VALID_JVM_VARIANTS@
 
+# Control wether Hotspot builds gtest tests
+BUILD_GTEST := true
+
 # Control use of precompiled header in hotspot libjvm build
 USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
 
@@ -684,6 +687,7 @@
 LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
 MSVCR_DLL:=@MSVCR_DLL@
 MSVCP_DLL:=@MSVCP_DLL@
+STLPORT_LIB:=@STLPORT_LIB@
 
 ####################################################
 #