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

[James Berry]

On Jan 26, 2012, at 1:32 PM, Ryan Schmidt wrote:

> 
> On Jan 26, 2012, at 14:01, jberry at macports.org wrote:
> 
>> Revision: 89359
>>         http://trac.macports.org/changeset/89359
>> Author:   jberry at macports.org
>> Date:     2012-01-26 12:01:52 -0800 (Thu, 26 Jan 2012)
>> Log Message:
>> -----------
>> Guard search for xcrun inside catch clause.
>> If xcrun is not present (Xcode 2.x, apparently), then
>> this allows us to fall-back to a conventional compiler
>> location rather than failing outright due to a lack of
>> xcrun.
> 
> This fixes this ticket, right?
> 
> https://trac.macports.org/ticket/32890

Yes. Thanks, I hadn't noticed that ticket. Marked as fixed.

James


> 
> 
>> Modified: trunk/base/src/port1.0/portconfigure.tcl
>> ===================================================================
>> --- trunk/base/src/port1.0/portconfigure.tcl	2012-01-26 18:37:43 UTC (rev 89358)
>> +++ trunk/base/src/port1.0/portconfigure.tcl	2012-01-26 20:01:52 UTC (rev 89359)
>> @@ -430,8 +430,7 @@
>> 	global developer_dir
>> 	
>> 	# Use xcode's xcrun to find the named tool.
>> -	set xcrun [findBinary xcrun $portutil::autoconf::xcrun_path]
>> -	if {[catch {set toolpath [exec ${xcrun} -find ${name}]} result] == 0} {
>> +	if {[catch {set toolpath [exec [findBinary xcrun $portutil::autoconf::xcrun_path] -find ${name}]} result] == 0} {
>> 		return ${toolpath}
>> 	}
> 
> 
>