Commit 4fc83f0a authored by sbc@chromium.org's avatar sbc@chromium.org

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

This allows libraries installed by naclports "make" commands
to be visible to create_nmf by default.

BUG=179526
R=binji@chromium.org

Review URL: https://codereview.chromium.org/15896036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203977 0039d316-1c4b-4281-b951-d872f2087c98
parent 4e2b6f36
...@@ -610,10 +610,16 @@ def GetDefaultLibPath(config): ...@@ -610,10 +610,16 @@ def GetDefaultLibPath(config):
osname = getos.GetPlatform() osname = getos.GetPlatform()
libpath = [ libpath = [
# Core toolchain libraries
'toolchain/%s_x86_glibc/x86_64-nacl/lib' % osname, 'toolchain/%s_x86_glibc/x86_64-nacl/lib' % osname,
'toolchain/%s_x86_glibc/x86_64-nacl/lib32' % 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_32/%s' % config,
'lib/glibc_x86_64/%s' % config, 'lib/glibc_x86_64/%s' % config,
# naclports bundle libraries
'ports/lib/glibc_x86_32/%s' % config, 'ports/lib/glibc_x86_32/%s' % config,
'ports/lib/glibc_x86_64/%s' % config, 'ports/lib/glibc_x86_64/%s' % config,
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment