Skip to content

Commit

Permalink
Fixing paths messed up in previous sel_ldr.py change.
Browse files Browse the repository at this point in the history
This should correct the sel_ldr.py failures on naclports.

BUG=None
TBR=sbc@chromium.org
TEST=local naclports.

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

Cr-Commit-Position: refs/heads/master@{#335397}
  • Loading branch information
bradn123 authored and Commit bot committed Jun 20, 2015
1 parent 183868a commit 1e6b5a5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions native_client_sdk/src/tools/sel_ldr.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ def main(argv):
'glibc_%s' % arch_suffix, 'Release')
toolchain = '%s_x86_glibc' % osname
toolchain_dir = os.path.join(NACL_SDK_ROOT, 'toolchain', toolchain)
sdk_lib_dir = os.path.join(toolchain_dir, 'x86_64-nacl')
lib_dir = os.path.join(toolchain_dir, 'x86_64-nacl')
if arch == 'x86-64':
lib_dir = os.path.join(sdk_lib_dir, 'lib')
lib_dir = os.path.join(lib_dir, 'lib')
usr_lib_dir = os.path.join(toolchain_dir, 'x86_64-nacl', 'usr', 'lib')
else:
lib_dir = os.path.join(sdk_lib_dir, 'lib32')
lib_dir = os.path.join(lib_dir, 'lib32')
usr_lib_dir = os.path.join(toolchain_dir, 'i686-nacl', 'usr', 'lib')
ldso = os.path.join(sdk_lib_dir, 'runnable-ld.so')
ldso = os.path.join(lib_dir, 'runnable-ld.so')
cmd.append(ldso)
Log('LD.SO = %s' % ldso)
libpath = [usr_lib_dir, sdk_lib_dir, lib_dir]
Expand Down

0 comments on commit 1e6b5a5

Please sign in to comment.