diff options
Diffstat (limited to 'native_client_sdk/src/tools/lib/get_shared_deps.py')
| -rw-r--r-- | native_client_sdk/src/tools/lib/get_shared_deps.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/native_client_sdk/src/tools/lib/get_shared_deps.py b/native_client_sdk/src/tools/lib/get_shared_deps.py index ac5529a..5a3a658 100644 --- a/native_client_sdk/src/tools/lib/get_shared_deps.py +++ b/native_client_sdk/src/tools/lib/get_shared_deps.py @@ -27,7 +27,8 @@ SDK_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR)) NeededMatcher = re.compile('^ *NEEDED *([^ ]+)\n$') FormatMatcher = re.compile('^(.+):\\s*file format (.+)\n$') -RUNNABLE_LD = 'runnable-ld.so' # Name of the dynamic loader +LOADER_X86 = 'runnable-ld.so' # Name of the dynamic loader +LOADER_ARM = 'elf_loader_arm.nexe' # Name of the ARM dynamic loader OBJDUMP_ARCH_MAP = { # Names returned by Linux's objdump: @@ -89,8 +90,11 @@ def _GetNeededDynamic(main_files, objdump, lib_path): examined = set() all_files, unexamined = GleanFromObjdump(main_files, None, objdump, lib_path) for arch in all_files.itervalues(): - if unexamined and arch != 'arm': - unexamined.add((RUNNABLE_LD, arch)) + if unexamined: + if arch == 'arm': + unexamined.add((LOADER_ARM, arch)) + else: + unexamined.add((LOADER_X86, arch)) while unexamined: files_to_examine = {} |