[NaCl SDK] Add toolchain's usr/lib to create_nmf's default libpath

native_client_sdk/src/tools/create_nmf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import errno
 import hashlib
 import json
 import optparse
 import os
@@ skipping 592 matching lines @@
   """
   assert(config in ('Debug', 'Release'))
   sdk_root = GetSDKRoot()
   if not sdk_root:
     # TOOD(sbc): output a warning here?  We would also need to suppress
     # the warning when run from the chromium build.
     return []
 
   osname = getos.GetPlatform()
   libpath = [
+    # Core toolchain libraries
     'toolchain/%s_x86_glibc/x86_64-nacl/lib' % osname,
     'toolchain/%s_x86_glibc/x86_64-nacl/lib32' % osname,
+    # naclports installed libraries
+    'toolchain/%s_x86_glibc/x86_64-nacl/usr/lib' % osname,
+    'toolchain/%s_x86_glibc/i686-nacl/usr/lib' % osname,
+    # SDK bundle libraries
     'lib/glibc_x86_32/%s' % config,
     'lib/glibc_x86_64/%s' % config,
+    # naclports bundle libraries
     'ports/lib/glibc_x86_32/%s' % config,
     'ports/lib/glibc_x86_64/%s' % config,
   ]
   libpath = [os.path.normpath(p) for p in libpath]
   libpath = [os.path.join(sdk_root, p) for p in libpath]
   return libpath
 
 
 def main(argv):
   parser = optparse.OptionParser(
@@ skipping 96 matching lines @@
 if __name__ == '__main__':
   try:
     rtn = main(sys.argv[1:])
   except Error, e:
     sys.stderr.write('%s: %s\n' % (os.path.basename(__file__), e))
     rtn = 1
   except KeyboardInterrupt:
     sys.stderr.write('%s: interrupted\n' % os.path.basename(__file__))
     rtn = 1
   sys.exit(rtn)