Adding cross-compile ability to the make build

pylib/gyp/generator/xcode.py

 #!/usr/bin/python
 
 import filecmp
 import gyp.common
 import gyp.xcodeproj_file
 import errno
 import os
 import posixpath
 import re
 import shutil
@@ skipping 155 matching lines @@
     # does the it define it's own "all"?
     has_custom_all = False
 
     # targets_for_all is the list of ordinary_targets that should be listed
     # in this project's "All" target.  It includes each non_runtest_target
     # that does not have suppress_wildcard set.
     targets_for_all = []
 
     for target in self.build_file_dict['targets']:
       target_name = target['target_name']
-      qualified_target = gyp.common.QualifiedTarget(self.gyp_path, target_name)
+      toolset = target['toolset']
+      qualified_target = gyp.common.QualifiedTarget(self.gyp_path, target_name,
+                                                    toolset)
       xcode_target = xcode_targets[qualified_target]
       # Make sure that the target being added to the sorted list is already in
       # the unsorted list.
       assert xcode_target in self.project._properties['targets']
       targets.append(xcode_target)
       ordinary_targets.append(xcode_target)
 
       if not target.get('suppress_wildcard', False):
         targets_for_all.append(xcode_target)
 
@@ skipping 136 matching lines @@
     # these references.
 
     # To support making a "test runner" target that will run all the tests
     # that are direct dependents of any given target, we look for
     # xcode_create_dependents_test_runner being set on an Aggregate target,
     # and generate a second target that will run the tests found under the
     # marked target.
     for bf_tgt in self.build_file_dict['targets']:
       if int(bf_tgt.get('xcode_create_dependents_test_runner', 0)):
         tgt_name = bf_tgt['target_name']
+        toolset = bf_tgt['toolset']
         qualified_target = gyp.common.QualifiedTarget(self.gyp_path,
-                                                      tgt_name)
+                                                      tgt_name, toolset)
         xcode_target = xcode_targets[qualified_target]
         if isinstance(xcode_target, gyp.xcodeproj_file.PBXAggregateTarget):
           # Collect all the test targets.
           all_tests = []
           pbxtds = xcode_target.GetProperty('dependencies')
           for pbxtd in pbxtds:
             pbxcip = pbxtd.GetProperty('targetProxy')
             dependency_xct = pbxcip.GetProperty('remoteGlobalIDString')
             target_dict = xcode_target_to_target_dict[dependency_xct]
             if target_dict and int(target_dict.get('test', 0)):
@@ skipping 218 matching lines @@
 
     main_group = pbxp.GetProperty('mainGroup')
     build_group = gyp.xcodeproj_file.PBXGroup({'name': 'Build'})
     main_group.AppendChild(build_group)
     for included_file in build_file_dict['included_files']:
       build_group.AddOrGetFileByPath(included_file, False)
 
   xcode_targets = {}
   xcode_target_to_target_dict = {}
   for qualified_target in target_list:
-    [build_file, target_name] = \
-        gyp.common.BuildFileAndTarget('', qualified_target)[0:2]
+    [build_file, target_name, toolset] = \
+        gyp.common.ParseQualifiedTarget(qualified_target)
+
     spec = target_dicts[qualified_target]
+    if spec['toolset'] != 'target':
+      raise Exception(
+          'Multiple toolsets not supported in xcode build (target %s)' %
+          qualified_target)
     configuration_names = [spec['default_configuration']]
     for configuration_name in sorted(spec['configurations'].keys()):
       if configuration_name not in configuration_names:
         configuration_names.append(configuration_name)
     xcp = xcode_projects[build_file]
     pbxp = xcp.project
 
     # Set up the configurations for the target according to the list of names
     # supplied.
     xccl = gyp.xcodeproj_file.XCConfigurationList({'buildConfigurations': []})
@@ skipping 500 matching lines @@
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize1(xcode_targets)
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize2(xcode_targets,
                                          xcode_target_to_target_dict)
 
   for build_file in build_files:
     xcode_projects[build_file].Write()