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

Unified Diff: SConstruct

Issue 10416014: Route the buiding of libnosys, libpthread through NaClSdkLibrary. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 8 years, 7 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 | « no previous file | src/untrusted/irt_stub/nacl.scons » ('j') | src/untrusted/nosys/nacl.scons » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
===================================================================
--- SConstruct (revision 8659)
+++ SConstruct (working copy)
@@ -3416,8 +3416,13 @@
nacl_env.AddMethod(NaClSharedLibrary)
def NaClSdkLibrary(env, lib_name, *args, **kwargs):
+ gen_shared = not env.Bit('nacl_disable_shared')
+ if 'no_shared_lib' in kwargs:
+ if kwargs['no_shared_lib']:
jvoung - send to chromium... 2012/05/22 20:49:40 Can't you still add a arg with a default value, in
Robert Muth (chromium) 2012/05/22 21:16:36 Sadly you cannot mix args that way in python The o
jvoung - send to chromium... 2012/05/22 23:22:13 Well it worked on a simple example I tried, but th
+ gen_shared = False
+ del kwargs['no_shared_lib']
n = [env.ComponentLibrary(lib_name, *args, **kwargs)]
- if not env.Bit('nacl_disable_shared'):
+ if gen_shared:
n.append(NaClSharedLibrary(env, lib_name, *args, **kwargs))
return n
« no previous file with comments | « no previous file | src/untrusted/irt_stub/nacl.scons » ('j') | src/untrusted/nosys/nacl.scons » ('J')

Powered by Google App Engine
This is Rietveld 408576698