Index: native_client_sdk/src/tools/create_nmf.py |
diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py |
index 75816b171d230477b090800f1b751f70a2be07a8..a9aad544cb217c2da9ddd3e0c8940ceeec18588e 100755 |
--- a/native_client_sdk/src/tools/create_nmf.py |
+++ b/native_client_sdk/src/tools/create_nmf.py |
@@ -610,10 +610,16 @@ def GetDefaultLibPath(config): |
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, |
] |