Index: java/openjdk8/files/patch-common-autoconf-toolchain.m4
===================================================================
--- java/openjdk8/files/patch-common-autoconf-toolchain.m4	(revision 401104)
+++ java/openjdk8/files/patch-common-autoconf-toolchain.m4	(working copy)
@@ -1,11 +1,60 @@
---- common/autoconf/toolchain.m4.orig	2014-11-08 19:52:00.000000000 -0800
-+++ common/autoconf/toolchain.m4	2014-11-08 19:52:15.000000000 -0800
-@@ -971,7 +971,7 @@
-     fi
+--- common/autoconf/toolchain.m4.orig	2015-09-26 23:49:33.718498000 +0000
++++ common/autoconf/toolchain.m4	2015-09-26 23:52:21.858494000 +0000
+@@ -342,7 +342,11 @@
+   # Elsewhere, gcc is preferred to cc.
  
-     if test "`uname -s`" = "FreeBSD"; then
--      PACKAGE_PATH=/usr/local
+   if test "x$CC" != x; then
+-    COMPILER_CHECK_LIST="$CC"
++    if AS_EXECUTABLE_P(["$CC"]); then
++      COMPILER_CHECK_LIST=
++    else
++      COMPILER_CHECK_LIST="$CC"
++    fi
+   elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+     COMPILER_CHECK_LIST="cl"
+   elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+@@ -354,7 +358,10 @@
+     COMPILER_CHECK_LIST="gcc cc"
+   fi
+ 
+-  TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
++  if test "x$COMPILER_CHECK_LIST" != x; then
++    TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
++  fi
++
+   # Now that we have resolved CC ourself, let autoconf have its go at it
+   AC_PROG_CC([$CC])
+ 
+@@ -369,7 +376,11 @@
+   ### Locate C++ compiler (CXX)
+ 
+   if test "x$CXX" != x; then
+-    COMPILER_CHECK_LIST="$CXX"
++    if AS_EXECUTABLE_P(["$CXX"]); then
++      COMPILER_CHECK_LIST=
++    else
++      COMPILER_CHECK_LIST="$CXX"
++    fi
+   elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+     COMPILER_CHECK_LIST="cl"
+   elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+@@ -381,7 +392,9 @@
+     COMPILER_CHECK_LIST="g++ CC"
+   fi
+ 
+-  TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
++  if test "x$COMPILER_CHECK_LIST" != x; then
++    TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
++  fi
+   # Now that we have resolved CXX ourself, let autoconf have its go at it
+   AC_PROG_CXX([$CXX])
+ 
+@@ -1046,7 +1059,7 @@
+   PACKAGE_PATH="$with_package_path"
+   if test "x$PACKAGE_PATH" = x; then
+     if test "`uname -s`" = "Darwin"; then
+-      PACKAGE_PATH=/opt/local
 +      PACKAGE_PATH=%%LOCALBASE%%
      fi
  
-     if test "`uname -s`" = "NetBSD"; then
+     if test "`uname -s`" = "FreeBSD"; then