Commit 4b68c12a authored by ncbray@chromium.org's avatar ncbray@chromium.org

Make each NaCl glibc test copy its shared libraries into a unique directory.

This will prevent build problems when there is more than one glibc test.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=2959
TEST= none


Review URL: https://chromiumcodereview.appspot.com/10837325

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152401 0039d316-1c4b-4281-b951-d872f2087c98
parent 59aab7e4
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
'>@(_inputs)', '>@(_inputs)',
'--objdump=>(nacl_objdump)', '--objdump=>(nacl_objdump)',
'--output=>(nmf_glibc)', '--output=>(nmf_glibc)',
'--path-prefix=>(nexe_target)_libs',
'--stage-dependencies=<(nacl_glibc_out_dir)', '--stage-dependencies=<(nacl_glibc_out_dir)',
'--toolchain=glibc', '--toolchain=glibc',
], ],
......
...@@ -377,6 +377,9 @@ def Main(argv): ...@@ -377,6 +377,9 @@ def Main(argv):
action='append', default=[], action='append', default=[],
help='Add DIRECTORY to library search path', help='Add DIRECTORY to library search path',
metavar='DIRECTORY') metavar='DIRECTORY')
parser.add_option('-P', '--path-prefix', dest='path_prefix', default='',
help='A path to prepend to shared libraries in the .nmf',
metavar='DIRECTORY')
parser.add_option('-s', '--stage-dependencies', dest='stage_dependencies', parser.add_option('-s', '--stage-dependencies', dest='stage_dependencies',
help='Destination directory for staging libraries', help='Destination directory for staging libraries',
metavar='DIRECTORY') metavar='DIRECTORY')
...@@ -415,9 +418,15 @@ def Main(argv): ...@@ -415,9 +418,15 @@ def Main(argv):
raise Error('Expecting --name=<orig_arch.so>,<new_name.so>') raise Error('Expecting --name=<orig_arch.so>,<new_name.so>')
remap[parts[0]] = parts[1] remap[parts[0]] = parts[1]
if options.path_prefix:
path_prefix = options.path_prefix.split('/')
else:
path_prefix = []
nmf = NmfUtils(objdump=options.objdump, nmf = NmfUtils(objdump=options.objdump,
main_files=args, main_files=args,
lib_path=options.lib_path, lib_path=options.lib_path,
lib_prefix=path_prefix,
toolchain=options.toolchain, toolchain=options.toolchain,
remap=remap) remap=remap)
......
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