OLD | NEW |
1 #! -*- python -*- | 1 #! -*- python -*- |
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import atexit | 6 import atexit |
7 import glob | 7 import glob |
8 import os | 8 import os |
9 import platform | 9 import platform |
10 import shutil | 10 import shutil |
(...skipping 3392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3403 | 3403 |
3404 def NaClSharedLibrary(env, lib_name, *args, **kwargs): | 3404 def NaClSharedLibrary(env, lib_name, *args, **kwargs): |
3405 env_shared = env.Clone(COMPONENT_STATIC=False) | 3405 env_shared = env.Clone(COMPONENT_STATIC=False) |
3406 soname = SCons.Util.adjustixes(lib_name, 'lib', '.so') | 3406 soname = SCons.Util.adjustixes(lib_name, 'lib', '.so') |
3407 env_shared.AppendUnique(SHLINKFLAGS=['-Wl,-soname,%s' % (soname)]) | 3407 env_shared.AppendUnique(SHLINKFLAGS=['-Wl,-soname,%s' % (soname)]) |
3408 return env_shared.ComponentLibrary(lib_name, *args, **kwargs) | 3408 return env_shared.ComponentLibrary(lib_name, *args, **kwargs) |
3409 | 3409 |
3410 nacl_env.AddMethod(NaClSharedLibrary) | 3410 nacl_env.AddMethod(NaClSharedLibrary) |
3411 | 3411 |
3412 def NaClSdkLibrary(env, lib_name, *args, **kwargs): | 3412 def NaClSdkLibrary(env, lib_name, *args, **kwargs): |
| 3413 gen_shared = not env.Bit('nacl_disable_shared') |
| 3414 if 'no_shared_lib' in kwargs: |
| 3415 if kwargs['no_shared_lib']: |
| 3416 gen_shared = False |
| 3417 del kwargs['no_shared_lib'] |
3413 n = [env.ComponentLibrary(lib_name, *args, **kwargs)] | 3418 n = [env.ComponentLibrary(lib_name, *args, **kwargs)] |
3414 if not env.Bit('nacl_disable_shared'): | 3419 if gen_shared: |
3415 n.append(NaClSharedLibrary(env, lib_name, *args, **kwargs)) | 3420 n.append(NaClSharedLibrary(env, lib_name, *args, **kwargs)) |
3416 return n | 3421 return n |
3417 | 3422 |
3418 nacl_env.AddMethod(NaClSdkLibrary) | 3423 nacl_env.AddMethod(NaClSdkLibrary) |
3419 | 3424 |
3420 | 3425 |
3421 # --------------------------------------------------------------------- | 3426 # --------------------------------------------------------------------- |
3422 # Special environment for untrusted test binaries that use raw syscalls | 3427 # Special environment for untrusted test binaries that use raw syscalls |
3423 # --------------------------------------------------------------------- | 3428 # --------------------------------------------------------------------- |
3424 def RawSyscallObjects(env, sources): | 3429 def RawSyscallObjects(env, sources): |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3851 nacl_env.ValidateSdk() | 3856 nacl_env.ValidateSdk() |
3852 | 3857 |
3853 if BROKEN_TEST_COUNT > 0: | 3858 if BROKEN_TEST_COUNT > 0: |
3854 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3859 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
3855 if GetOption('brief_comstr'): | 3860 if GetOption('brief_comstr'): |
3856 msg += " Add --verbose to the command line for more information." | 3861 msg += " Add --verbose to the command line for more information." |
3857 print msg | 3862 print msg |
3858 | 3863 |
3859 # separate warnings from actual build output | 3864 # separate warnings from actual build output |
3860 Banner('B U I L D - O U T P U T:') | 3865 Banner('B U I L D - O U T P U T:') |
OLD | NEW |