[88787] trunk/base/src/port1.0/portconfigure.tcl

jberry at macports.org jberry at macports.org
Wed Jan 11 10:06:49 PST 2012


Revision: 88787
          http://trac.macports.org/changeset/88787
Author:   jberry at macports.org
Date:     2012-01-11 10:06:46 -0800 (Wed, 11 Jan 2012)
Log Message:
-----------
In falling back if xcrun fails to find a compiler, look first
in ${developer_dir}/usr/bin/, then in /usr/bin.

Just because not doing so was bugging me.

Modified Paths:
--------------
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2012-01-11 17:49:57 UTC (rev 88786)
+++ trunk/base/src/port1.0/portconfigure.tcl	2012-01-11 18:06:46 UTC (rev 88787)
@@ -436,10 +436,18 @@
 	}
 	
 	# If xcrun failed to find the tool, return a path from
-	# the developer_dir. The tool may not be there, but we'll
-	# leave it up to the invoking code to figure out that it
-	# doesn't have a valid compiler
-	return "${developer_dir}/usr/bin/${name}"
+	# the developer_dir, falling back to /usr/bin.
+	# The tool may not be there, but we'll leave it up to
+	# the invoking code to figure out that it doesn't have
+	# a valid compiler
+	set toolpath ""
+	foreach path "${developer_dir}/usr/bin /usr/bin" {
+		set toolpath "${path}/${name}"
+		if {[file executable $toolpath]} {
+			break
+		}
+	}
+	return $toolpath
 }
 
 # internal function to find correct compilers
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120111/ff61aded/attachment.html>


More information about the macports-changes mailing list