ninja windows: fix long command lines in more cases

pylib/gyp/generator/ninja.py

 # Copyright (c) 2012 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 copy
 import gyp
 import gyp.common
 import gyp.msvs_emulation
 import gyp.MSVSVersion
 import gyp.system_test
@@ skipping 1322 matching lines @@
                '-Wl,--start-group $in -Wl,--end-group $libs'))
     master_ninja.rule(
       'link',
       description='LINK $out',
       command=('$ld $ldflags -o $out -Wl,-rpath=\$$ORIGIN/lib '
                '-Wl,--start-group $in -Wl,--end-group $libs'))
   elif flavor == 'win':
     master_ninja.rule(
         'alink',
         description='LIB $out',
-        command='$ar /nologo /ignore:4221 /OUT:$out @$out.rsp $libflags',
+        command='$ar /nologo /ignore:4221 /OUT:$out @$out.rsp',
         rspfile='$out.rsp',
-        rspfile_content='$in')
+        rspfile_content='$in $libflags')
     dlldesc = 'LINK(DLL) $dll'
     dllcmd = ('python gyp-win-tool link-wrapper '
               '$ld /nologo /IMPLIB:$implib /DLL /OUT:$dll '
-              '/PDB:$dll.pdb $libs @$dll.rsp $ldflags')
+              '/PDB:$dll.pdb @$dll.rsp')
     master_ninja.rule('solink', description=dlldesc, command=dllcmd,
-                      rspfile='$dll.rsp', rspfile_content='$in',
+                      rspfile='$dll.rsp',
+                      rspfile_content='$libs $in $ldflags',
                       restat=True)
     master_ninja.rule('solink_module', description=dlldesc, command=dllcmd,
-                      rspfile='$dll.rsp', rspfile_content='$in',
+                      rspfile='$dll.rsp',
+                      rspfile_content='$libs $in $ldflags',
                       restat=True)
     # Note that ldflags goes at the end so that it has the option of
     # overriding default settings earlier in the command line.
     master_ninja.rule(
         'link',
         description='LINK $out',
         command=('python gyp-win-tool link-wrapper '
-                 '$ld /nologo /OUT:$out /PDB:$out.pdb $in $libs $ldflags'))
+                 '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp'),
+        rspfile='$out.rsp',
+        rspfile_content='$in $libs $ldflags')
   else:
     master_ninja.rule(
       'objc',
       description='OBJC $out',
       command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_objc '
                '$cflags_pch_objc -c $in -o $out'),
       depfile='$out.d')
     master_ninja.rule(
       'objcxx',
       description='OBJCXX $out',
@@ skipping 110 matching lines @@
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)