Adds support for the library_dirs key, which appears in the documentation but was never actually im…

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 multiprocessing
 import os.path
 import re
 import signal
@@ skipping 755 matching lines @@
 
     include_dirs = config.get('include_dirs', [])
     if self.flavor == 'win':
       include_dirs = self.msvs_settings.AdjustIncludeDirs(include_dirs,
                                                           config_name)
     env = self.GetSortedXcodeEnv()
     self.WriteVariableList('includes',
         [QuoteShellArgument('-I' + self.GypPathToNinja(i, env), self.flavor)
          for i in include_dirs])
 
+    library_dirs = config.get('library_dirs', [])
+    if self.flavor == 'win':
+      library_dirs = [
+          self.msvs_settings.ConvertVSMacros(library_dir, config_name)
+          for library_dir in library_dirs]
+      self.WriteVariableList('libdirs',
+           [QuoteShellArgument('-LIBPATH:' + self.GypPathToNinja(l),
+                               self.flavor)
+           for l in library_dirs])
+    else:
+      self.WriteVariableList('libdirs',
+           [QuoteShellArgument('-L' + self.GypPathToNinja(l), self.flavor)
+           for l in library_dirs])
+
     pch_commands = precompiled_header.GetPchBuildCommands()
     if self.flavor == 'mac':
       self.WriteVariableList('cflags_pch_c',
                              [precompiled_header.GetInclude('c')])
       self.WriteVariableList('cflags_pch_cc',
                              [precompiled_header.GetInclude('cc')])
       self.WriteVariableList('cflags_pch_objc',
                              [precompiled_header.GetInclude('m')])
       self.WriteVariableList('cflags_pch_objcc',
                              [precompiled_header.GetInclude('mm')])
@@ skipping 634 matching lines @@
 
   rule_name_suffix = _GetWinLinkRuleNameSuffix(embed_manifest, link_incremental)
   dlldesc = 'LINK%s(DLL) $dll' % rule_name_suffix.upper()
   dllcmd = ('%s gyp-win-tool link-wrapper $arch '
             '$ld /nologo $implibflag /DLL /OUT:$dll '
             '/PDB:$dll.pdb @$dll.rsp' % sys.executable)
   dllcmd = FullLinkCommand(dllcmd, '$dll', 'dll')
   master_ninja.rule('solink' + rule_name_suffix,
                     description=dlldesc, command=dllcmd,
                     rspfile='$dll.rsp',
-                    rspfile_content='$libs $in_newline $ldflags',
+                    rspfile_content='$libdirs $libs $in_newline $ldflags',
                     restat=True)
   master_ninja.rule('solink_module' + rule_name_suffix,
                     description=dlldesc, command=dllcmd,
                     rspfile='$dll.rsp',
-                    rspfile_content='$libs $in_newline $ldflags',
+                    rspfile_content='$libdirs $libs $in_newline $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.
   exe_cmd = ('%s gyp-win-tool link-wrapper $arch '
              '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp' %
               sys.executable)
   exe_cmd = FullLinkCommand(exe_cmd, '$out', 'exe')
   master_ninja.rule('link' + rule_name_suffix,
                     description='LINK%s $out' % rule_name_suffix.upper(),
                     command=exe_cmd,
                     rspfile='$out.rsp',
-                    rspfile_content='$in_newline $libs $ldflags')
+                    rspfile_content='$in_newline $libdirs $libs $ldflags')
 
 
 def GenerateOutputForConfig(target_list, target_dicts, data, params,
                             config_name):
   options = params['options']
   flavor = gyp.common.GetFlavor(params)
   generator_flags = params.get('generator_flags', {})
 
   # generator_dir: relative path from pwd to where make puts build files.
   # Makes migrating from make to ninja easier, ninja doesn't put anything here.
@@ skipping 224 matching lines @@
             'extract_toc':
               ('{ readelf -d ${lib} | grep SONAME ; '
                'nm -gD -f p ${lib} | cut -f1-2 -d\' \'; }')})
 
     master_ninja.rule(
       'solink',
       description='SOLINK $lib',
       restat=True,
       command=(mtime_preserving_solink_base % {
           'suffix': '-Wl,--whole-archive $in $solibs -Wl,--no-whole-archive '
-          '$libs'}),
+          '$libdirs $libs'}),
       pool='link_pool')
     master_ninja.rule(
       'solink_module',
       description='SOLINK(module) $lib',
       restat=True,
       command=(mtime_preserving_solink_base % {
-          'suffix': '-Wl,--start-group $in $solibs -Wl,--end-group $libs'}),
+          'suffix': '-Wl,--start-group $in $solibs -Wl,--end-group '
+          '$libdirs $libs'}),

[Nico, 2013/07/02 01:20:15]

Is it possible to just add these flags to the "libs" variable? This way ninja
needs to do fewer variable lookups. Have you benchmarked if this change has an
impact on empty build times for chrome?

       pool='link_pool')
     master_ninja.rule(
       'link',
       description='LINK $out',
       command=('$ld $ldflags -o $out '
-               '-Wl,--start-group $in $solibs -Wl,--end-group $libs'),
+               '-Wl,--start-group $in $solibs -Wl,--end-group $libdirs $libs'),
       pool='link_pool')
   elif flavor == 'win':
     master_ninja.rule(
         'alink',
         description='LIB $out',
         command=('%s gyp-win-tool link-wrapper $arch '
                  '$ar /nologo /ignore:4221 /OUT:$out @$out.rsp' %
                  sys.executable),
         rspfile='$out.rsp',
         rspfile_content='$in_newline $libflags')
@@ skipping 46 matching lines @@
               '{ otool -l $lib | grep LC_ID_DYLIB -A 5; '
               'nm -gP $lib | cut -f1-2 -d\' \' | grep -v U$$; true; }'})
 
     # TODO(thakis): The solink_module rule is likely wrong. Xcode seems to pass
     # -bundle -single_module here (for osmesa.so).
     master_ninja.rule(
       'solink',
       description='SOLINK $lib, POSTBUILDS',
       restat=True,
       command=(mtime_preserving_solink_base % {
-          'suffix': '$in $solibs $libs$postbuilds'}),
+          'suffix': '$in $solibs $libdirs $libs$postbuilds'}),
       pool='link_pool')
     master_ninja.rule(
       'solink_module',
       description='SOLINK(module) $lib, POSTBUILDS',
       restat=True,
       command=(mtime_preserving_solink_base % {
-          'suffix': '$in $solibs $libs$postbuilds'}),
+          'suffix': '$in $solibs $libdirs $libs$postbuilds'}),
       pool='link_pool')
 
     master_ninja.rule(
       'link',
       description='LINK $out, POSTBUILDS',
       command=('$ld $ldflags -o $out '
-               '$in $solibs $libs$postbuilds'),
+               '$in $solibs $libdirs $libs$postbuilds'),
       pool='link_pool')
     master_ninja.rule(
       'infoplist',
       description='INFOPLIST $out',
       command=('$cc -E -P -Wno-trigraphs -x c $defines $in -o $out && '
                'plutil -convert xml1 $out $out'))
     master_ninja.rule(
       'mac_tool',
       description='MACTOOL $mactool_cmd $in',
       command='$env ./gyp-mac-tool $mactool_cmd $in $out')
@@ skipping 125 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)