common/autoconf/toolchain.m4

@@ -839,12 +839,16 @@
     BUILD_LDCXX="$LDCXX"
     BUILD_NM="$NM"
     BUILD_AS="$AS"
     BUILD_OBJCOPY="$OBJCOPY"
     BUILD_STRIP="$STRIP"
+    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_])
   fi