diff options
author | Leon Clarke <leonclarke@google.com> | 2010-01-27 17:25:45 +0000 |
---|---|---|
committer | Leon Clarke <leonclarke@google.com> | 2010-01-27 17:31:21 +0000 |
commit | d91b9f7d46489a9ee00f9cb415630299c76a502b (patch) | |
tree | 741552f95883bb7461cf7c1d36335cef68804a5b /SConstruct | |
parent | eab96aab0834f21954b5d6aa6366bcfb348ed811 (diff) | |
download | android_external_v8-d91b9f7d46489a9ee00f9cb415630299c76a502b.tar.gz android_external_v8-d91b9f7d46489a9ee00f9cb415630299c76a502b.tar.bz2 android_external_v8-d91b9f7d46489a9ee00f9cb415630299c76a502b.zip |
Merge from v8 at revision 3723
Diffstat (limited to 'SConstruct')
-rw-r--r--[-rwxr-xr-x] | SConstruct | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 739e3445..c9c5a55c 100755..100644 --- a/SConstruct +++ b/SConstruct @@ -35,7 +35,6 @@ root_dir = dirname(File('SConstruct').rfile().abspath) sys.path.append(join(root_dir, 'tools')) import js2c, utils - # ANDROID_TOP is the top of the Android checkout, fetched from the environment # variable 'TOP'. You will also need to set the CXX, CC, AR and RANLIB # environment variables to the cross-compiling tools. @@ -157,6 +156,11 @@ LIBRARY_FLAGS = { 'LIBPATH' : ['/usr/local/lib'], 'CCFLAGS': ['-ansi'], }, + 'os:solaris': { + 'CPPPATH' : ['/usr/local/include'], + 'LIBPATH' : ['/usr/local/lib'], + 'CCFLAGS': ['-ansi'], + }, 'os:win32': { 'CCFLAGS': ['-DWIN32'], 'CXXFLAGS': ['-DWIN32'], @@ -277,18 +281,12 @@ V8_EXTRA_FLAGS = { }, 'msvc': { 'all': { - 'WARNINGFLAGS': ['/WX', '/wd4355', '/wd4800'] + 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800'] }, 'library:shared': { 'CPPDEFINES': ['BUILDING_V8_SHARED'], 'LIBS': ['winmm', 'ws2_32'] }, - 'arch:ia32': { - 'WARNINGFLAGS': ['/W3'] - }, - 'arch:x64': { - 'WARNINGFLAGS': ['/W3'] - }, 'arch:arm': { 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'], # /wd4996 is to silence the warning about sscanf @@ -313,6 +311,10 @@ MKSNAPSHOT_EXTRA_FLAGS = { 'os:freebsd': { 'LIBS': ['execinfo', 'pthread'] }, + 'os:solaris': { + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'], + 'LINKFLAGS': ['-mt'] + }, 'os:openbsd': { 'LIBS': ['execinfo', 'pthread'] }, @@ -362,6 +364,10 @@ CCTEST_EXTRA_FLAGS = { 'os:freebsd': { 'LIBS': ['execinfo', 'pthread'] }, + 'os:solaris': { + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'], + 'LINKFLAGS': ['-mt'] + }, 'os:openbsd': { 'LIBS': ['execinfo', 'pthread'] }, @@ -420,6 +426,11 @@ SAMPLE_FLAGS = { 'LIBPATH' : ['/usr/local/lib'], 'LIBS': ['execinfo', 'pthread'] }, + 'os:solaris': { + 'LIBPATH' : ['/usr/local/lib'], + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'], + 'LINKFLAGS': ['-mt'] + }, 'os:openbsd': { 'LIBPATH' : ['/usr/local/lib'], 'LIBS': ['execinfo', 'pthread'] @@ -529,6 +540,10 @@ D8_FLAGS = { 'os:freebsd': { 'LIBS': ['pthread'], }, + 'os:solaris': { + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'], + 'LINKFLAGS': ['-mt'] + }, 'os:openbsd': { 'LIBS': ['pthread'], }, @@ -582,7 +597,7 @@ SIMPLE_OPTIONS = { 'help': 'the toolchain to use (' + TOOLCHAIN_GUESS + ')' }, 'os': { - 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd'], + 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd', 'solaris'], 'default': OS_GUESS, 'help': 'the os to build for (' + OS_GUESS + ')' }, @@ -936,6 +951,7 @@ def BuildSpecific(env, mode, env_overrides): # Link the object files into a library. env.Replace(**context.flags['v8']) + context.ApplyEnvOverrides(env) if context.options['library'] == 'static': library = env.StaticLibrary(library_name, object_files) |