Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4189)

Unified Diff: build/build_nexe.py

Issue 10909144: Reapply change 9663 (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | build/nacl_core_sdk.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/build_nexe.py
===================================================================
--- build/build_nexe.py (revision 9678)
+++ build/build_nexe.py (working copy)
@@ -110,6 +110,8 @@
self.outdir = options.objdir
# Set the toolchain directories
+ print 'toolpath=' + options.toolpath
+ print 'toolname=' + self.toolname
self.toolchain = os.path.join(options.toolpath, self.toolname)
self.toolbin = os.path.join(self.toolchain, tool_subdir, 'bin')
@@ -206,6 +208,10 @@
options = ArgToList(options)
if self.toolname in ['glibc', 'newlib'] and self.mainarch == 'x86':
options += ['-B' + self.toollib]
+ if self.outtype == 'nso':
+ options += ['-Wl,-rpath-link,' + name for name in self.lib_paths]
+ options += ['-shared']
+ options += ['-Wl,-soname,' + os.path.basename(self.name)]
self.link_options = options + ['-L' + name for name in self.lib_paths]
def BuildArchiveOptions(self):
@@ -352,7 +358,7 @@
Link or Archive the final output file, from the compiled sources.
"""
- if self.outtype == 'nexe':
+ if self.outtype in ['nexe', 'nso']:
out = self.Link(srcs)
if self.strip_debug:
self.Strip(out)
@@ -407,6 +413,7 @@
return 1
options.verbose = True
+ print ' '.join(argv)
if options.source_list:
source_list_handle = open(options.source_list, 'r')
source_list = source_list_handle.read().splitlines()
« no previous file with comments | « build/all.gyp ('k') | build/nacl_core_sdk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698