diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2010-08-11 07:01:55 +0400 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2010-08-11 07:01:55 +0400 |
| commit | ac8050277cdf79784925c06b14b69cf9c02de14a (patch) | |
| tree | 32ef29717f44a3d6972e617394792ff63ebdbf91 /winsup/utils | |
| parent | 92514fd261d8d45efe623f773cf14f9b5a3966c9 (diff) | |
* mingw: Use sysroot, if present, for mingw_dir.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rwxr-xr-x | winsup/utils/mingw | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 21d02c3cb..1f0829104 100644 --- 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 8bf21cb5a..4e270fda9 100755 --- 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 |