Ticket #41104: toolchain_xcrun.patch

source/Categories/SysUtils.m

@@ -39 +39 @@
     NSString* relToolBase = [NSString pathWithComponents:
         [NSArray arrayWithObjects: @"/", @"usr", @"bin", nil]];
     NSString* relToolPath = [relToolBase stringByAppendingPathComponent: toolName];
-    NSString* selectToolPath = [relToolBase stringByAppendingPathComponent: @"xcode-select"];
+    NSString* selectToolPath = [relToolBase stringByAppendingPathComponent: @"xcrun"];
     NSTask* selectTask = [[[NSTask alloc] init] autorelease];
     NSPipe* selectPipe = [NSPipe pipe];
-    NSArray* args = [NSArray arrayWithObject: @"--print-path"];
+    NSArray* args = [NSArray arrayWithObjects: @"--find", toolName, nil];
 
     [selectTask setLaunchPath: selectToolPath];
     [selectTask setArguments: args];
@@ -61 +61 @@
                                                       length: [selectData length]
                                                     encoding: NSUTF8StringEncoding] autorelease];
 
-    return [[absToolPath stringByTrimmingCharactersInSet:
-        [NSCharacterSet whitespaceAndNewlineCharacterSet]]
-        stringByAppendingPathComponent: relToolPath];
+    return [absToolPath stringByTrimmingCharactersInSet:
+        [NSCharacterSet whitespaceAndNewlineCharacterSet]];
 }
 
 @end