ninja/mac: Fix multiarch link regression caused by 1871.

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import hashlib
 import json
 import multiprocessing
 import os.path
@@ skipping 1077 matching lines @@
 
     self.WriteVariableList(ninja_file, 'libs', library_dirs + libraries)
 
     linked_binary = output
 
     if command in ('solink', 'solink_module'):
       extra_bindings.append(('soname', os.path.split(output)[1]))
       extra_bindings.append(('lib',
                             gyp.common.EncodePOSIXShellArgument(output)))
       if self.flavor != 'win':
-        link_file_list = output + '.rsp'
+        link_file_list = output
         if self.is_mac_bundle:
           # 'Dependency Framework.framework/Versions/A/Dependency Framework' ->
           # 'Dependency Framework.framework.rsp'
-          link_file_list = self.xcode_settings.GetWrapperName() + '.rsp'
+          link_file_list = self.xcode_settings.GetWrapperName()
+        if arch:
+          link_file_list += '.' + arch
+        link_file_list += '.rsp'
         # If an rspfile contains spaces, ninja surrounds the filename with
         # quotes around it and then passes it to open(), creating a file with
         # quotes in its name (and when looking for the rsp file, the name
         # makes it through bash which strips the quotes) :-/
         link_file_list = link_file_list.replace(' ', '_')
         extra_bindings.append(
           ('link_file_list',
             gyp.common.EncodePOSIXShellArgument(link_file_list)))
       if self.flavor == 'win':
         extra_bindings.append(('binary', output))
@@ skipping 1070 matching lines @@
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)