From e504add64bf285585d9472b74791196d84c7876a Mon Sep 17 00:00:00 2001
From: cgf <cgf>
Date: Sun, 12 Oct 2008 03:20:37 +0000
Subject: [PATCH] * mingw: Use a better method to find where mingw directory
 lives.

---
 winsup/utils/ChangeLog | 4 ++++
 winsup/utils/mingw     | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 374cc8efcb..bd31c3f7c5 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-11  Christopher Faylor  <me+cygwin@cgf.cx>
 
+	* mingw: Use a better method to find where mingw directory lives.
+
+2008-10-11  Christopher Faylor  <me+cygwin@cgf.cx>
+
 	* mingw: New front-end script to control building of MinGW files
 	without using the deprecated -mno-cygwin option.
 	* Makefile.in: Use mingw front-end.
diff --git a/winsup/utils/mingw b/winsup/utils/mingw
index 7d49bf3264..720a25e2c9 100755
--- a/winsup/utils/mingw
+++ b/winsup/utils/mingw
@@ -6,18 +6,12 @@
 # Find the path to the compiler.
 #
 compiler=$1; shift
-case "$compiler" in
-	*/*)	;;
-	*)	compiler=($(type "$compiler"))
-		compiler=${compiler[2]} ;;
-esac
+dir=$(cd $(dirname $("$compiler" -print-prog-name=ld))/../..; pwd)
 
 #
 # The mingw32 directory should live somewhere close by to the
 # compiler.  Search for it.
 #
-updir=$(dirname "$compiler")
-dir=$(cd "$updir"/..; pwd)
 [ "$dir" = '/' ] && dir=''
 mingw_dir=''
 for d in "$dir"/*-mingw32 "$dir"/usr/*-mingw32 "$dir"/*-mingw* "$dir"/usr/*-mingw*; do
-- 
2.11.0