summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 22:15:01 +0000
committerncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 22:15:01 +0000
commit4b68c12a50abe41a68b1b51cd1af8a1ebc713611 (patch)
treeeb1e97004e1c9432cb99a948face03e7d1791ab3 /native_client_sdk
parent59aab7e48148b957d777470365b921b51cccb012 (diff)
downloadchromium_src-4b68c12a50abe41a68b1b51cd1af8a1ebc713611.zip
chromium_src-4b68c12a50abe41a68b1b51cd1af8a1ebc713611.tar.gz
chromium_src-4b68c12a50abe41a68b1b51cd1af8a1ebc713611.tar.bz2
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
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/tools/create_nmf.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py
index a27969f..195c553 100755
--- a/native_client_sdk/src/tools/create_nmf.py
+++ b/native_client_sdk/src/tools/create_nmf.py
@@ -377,6 +377,9 @@ def Main(argv):
action='append', default=[],
help='Add DIRECTORY to library search path',
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',
help='Destination directory for staging libraries',
metavar='DIRECTORY')
@@ -415,9 +418,15 @@ def Main(argv):
raise Error('Expecting --name=<orig_arch.so>,<new_name.so>')
remap[parts[0]] = parts[1]
+ if options.path_prefix:
+ path_prefix = options.path_prefix.split('/')
+ else:
+ path_prefix = []
+
nmf = NmfUtils(objdump=options.objdump,
main_files=args,
lib_path=options.lib_path,
+ lib_prefix=path_prefix,
toolchain=options.toolchain,
remap=remap)