* mingw: Use sysroot, if present, for mingw_dir.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 21d02c3..1f08291 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-10  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+       * mingw: Use sysroot, if present, for mingw_dir.
+
 2010-07-21  Corinna Vinschen  <corinna@vinschen.de>
 
        * dump_setup.cc (tfx_chars): New WCHAR array, copied from Cygwin.

diff --git a/winsup/utils/mingw b/winsup/utils/mingw
index 8bf21cb..4e270fd 100755 (executable)
--- a/winsup/utils/mingw
+++ b/winsup/utils/mingw
@@ -18,7 +18,11 @@ for d in "$dir"/*-mingw32 "$dir"/usr/*-mingw32 "$dir"/*-mingw* "$dir"/usr/*-ming
          /*-mingw32 /usr/*-mingw32 /*-mingw* /usr/*-mingw*; do
     case "$d" in
        *\**)   continue ;;
-       *)      mingw_dir=$d; break;
+       *)      if [ -d "$d"/sys-root/mingw ]; then
+                   mingw_dir=$d/sys-root/mingw
+               else
+                   mingw_dir=$d;
+               fi; break;
     esac
 done