--- old/common/autoconf/toolchain.m4	2016-09-13 07:53:27.479151314 -0400
+++ new/common/autoconf/toolchain.m4	2016-09-13 07:53:27.031125894 -0400
@@ -841,8 +841,12 @@
     BUILD_AS="$AS"
     BUILD_OBJCOPY="$OBJCOPY"
     BUILD_STRIP="$STRIP"
-    BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
-    BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
+    if test "x$BUILD_SYSROOT" != "x"; then
+      FLAGS_SETUP_SYSROOT_FLAGS([BUILD_])
+    else
+      BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
+      BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
+    fi
     BUILD_AR="$AR"
     
     TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_])