--- a/make/RunTestsPrebuiltSpec.gmk	Tue Oct 02 14:14:05 2018 -0700
+++ b/make/RunTestsPrebuiltSpec.gmk	Tue Oct 02 14:15:25 2018 -0700
@@ -172,3 +172,13 @@
 EXPR := expr
 FILE := file
 HG := hg
+
+# On Solaris gnu versions of some tools are required.
+ifeq ($(OPENJDK_BUILD_OS), solaris)
+  AWK := gawk
+  GREP := ggrep
+  EGREP := ggrep -E
+  FGREP := grep -F
+  SED := gsed
+  TAR := GTAR
+endif