Pass the mspdbsrv flag as a command line argument to the link wrapper.

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 copy
 import hashlib
 import json
 import multiprocessing
 import os.path
 import re
@@ skipping 1588 matching lines @@
     }[binary_type]
     return '%(python)s gyp-win-tool link-with-manifests $arch %(embed)s ' \
            '%(out)s "%(ldcmd)s" %(resname)s $mt $rc "$intermediatemanifest" ' \
            '$manifests' % {
                'python': sys.executable,
                'out': out,
                'ldcmd': ldcmd,
                'resname': resource_name,
                'embed': embed_manifest }
   rule_name_suffix = _GetWinLinkRuleNameSuffix(embed_manifest)
+  use_separate_mspdbsrv = os.environ.get('GYP_USE_SEPARATE_MSPDBSRV') != None

[scottmg, 2014/01/10 19:47:51]

maybe something like

int(os.environ.get('GYP_USE_SEPARATE_MSPDBSRV', '0')) != 0

would be better so that setting it "off" won't also cause it to be used.

[Sébastien Marchand, 2014/01/11 00:00:39]

Done.

   dlldesc = 'LINK%s(DLL) $binary' % rule_name_suffix.upper()
-  dllcmd = ('%s gyp-win-tool link-wrapper $arch '
+  dllcmd = ('%s gyp-win-tool link-wrapper $arch %s '
             '$ld /nologo $implibflag /DLL /OUT:$binary '
-            '@$binary.rsp' % sys.executable)
+            '@$binary.rsp' %
+            (sys.executable,
+             'True' if use_separate_mspdbsrv else 'False'))

[Sébastien Marchand, 2014/01/10 18:08:23]

I'm not satisfied with those 'True' and 'False' values, I've thought of
'multiple-mspdbsrv' and 'default-mspdbsrv' but I'm still not convinced... Do you
have a suggestion ?

[scottmg, 2014/01/10 19:47:51]

I think %s of |use_separate_mspdbsrv| directly is fine.

[Sébastien Marchand, 2014/01/11 00:00:39]

Done.

   dllcmd = FullLinkCommand(dllcmd, '$binary', 'dll')
   master_ninja.rule('solink' + rule_name_suffix,
                     description=dlldesc, command=dllcmd,
                     rspfile='$binary.rsp',
                     rspfile_content='$libs $in_newline $ldflags',
                     restat=True,
                     pool='link_pool')
   master_ninja.rule('solink_module' + rule_name_suffix,
                     description=dlldesc, command=dllcmd,
                     rspfile='$binary.rsp',
                     rspfile_content='$libs $in_newline $ldflags',
                     restat=True,
                     pool='link_pool')
   # Note that ldflags goes at the end so that it has the option of
   # overriding default settings earlier in the command line.
-  exe_cmd = ('%s gyp-win-tool link-wrapper $arch '
+  exe_cmd = ('%s gyp-win-tool link-wrapper $arch %s '
              '$ld /nologo /OUT:$binary @$binary.rsp' %
-              sys.executable)
+              (sys.executable,
+               'True' if use_separate_mspdbsrv else 'False'))
   exe_cmd = FullLinkCommand(exe_cmd, '$binary', 'exe')
   master_ninja.rule('link' + rule_name_suffix,
                     description='LINK%s $binary' % rule_name_suffix.upper(),
                     command=exe_cmd,
                     rspfile='$binary.rsp',
                     rspfile_content='$in_newline $libs $ldflags',
                     pool='link_pool')
 
 
 def GenerateOutputForConfig(target_list, target_dicts, data, params,
@@ skipping 498 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)