diff options
| author | Ben Murdoch <benm@google.com> | 2012-03-05 14:35:55 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-11 15:40:15 +0100 |
| commit | c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9 (patch) | |
| tree | 6f84ef396408af3c9f08eaac783ecf1a957b0fee /SConstruct | |
| parent | 592a9fc1d8ea420377a2e7efd0600e20b058be2b (diff) | |
| download | android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.gz android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.bz2 android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.zip | |
Merge V8 at 3.8.9.11
Bug: 5688872
Change-Id: Ie3b1dd67a730ec5e82686b7b37dba26f6a9bb24f
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -33,6 +33,7 @@ import os from os.path import join, dirname, abspath from types import DictType, StringTypes root_dir = dirname(File('SConstruct').rfile().abspath) +src_dir = join(root_dir, 'src') sys.path.insert(0, join(root_dir, 'tools')) import js2c, utils @@ -53,7 +54,7 @@ GCC_DTOA_EXTRA_CCFLAGS = [] LIBRARY_FLAGS = { 'all': { - 'CPPPATH': [join(root_dir, 'src')], + 'CPPPATH': [src_dir], 'regexp:interpreted': { 'CPPDEFINES': ['V8_INTERPRETED_REGEXP'] }, @@ -111,13 +112,13 @@ LIBRARY_FLAGS = { } }, 'os:freebsd': { - 'CPPPATH' : ['/usr/local/include'], + 'CPPPATH' : [src_dir, '/usr/local/include'], 'LIBPATH' : ['/usr/local/lib'], 'CCFLAGS': ['-ansi'], 'LIBS': ['execinfo'] }, 'os:openbsd': { - 'CPPPATH' : ['/usr/local/include'], + 'CPPPATH' : [src_dir, '/usr/local/include'], 'LIBPATH' : ['/usr/local/lib'], 'CCFLAGS': ['-ansi'], }, @@ -125,12 +126,12 @@ LIBRARY_FLAGS = { # On Solaris, to get isinf, INFINITY, fpclassify and other macros one # needs to define __C99FEATURES__. 'CPPDEFINES': ['__C99FEATURES__'], - 'CPPPATH' : ['/usr/local/include'], + 'CPPPATH' : [src_dir, '/usr/local/include'], 'LIBPATH' : ['/usr/local/lib'], 'CCFLAGS': ['-ansi'], }, 'os:netbsd': { - 'CPPPATH' : ['/usr/pkg/include'], + 'CPPPATH' : [src_dir, '/usr/pkg/include'], 'LIBPATH' : ['/usr/pkg/lib'], }, 'os:win32': { @@ -403,7 +404,7 @@ DTOA_EXTRA_FLAGS = { CCTEST_EXTRA_FLAGS = { 'all': { - 'CPPPATH': [join(root_dir, 'src')], + 'CPPPATH': [src_dir], 'library:shared': { 'CPPDEFINES': ['USING_V8_SHARED'] }, @@ -460,7 +461,7 @@ CCTEST_EXTRA_FLAGS = { SAMPLE_FLAGS = { 'all': { - 'CPPPATH': [join(abspath('.'), 'include')], + 'CPPPATH': [join(root_dir, 'include')], 'library:shared': { 'CPPDEFINES': ['USING_V8_SHARED'] }, @@ -643,7 +644,7 @@ SAMPLE_FLAGS = { PREPARSER_FLAGS = { 'all': { - 'CPPPATH': [join(abspath('.'), 'include'), join(abspath('.'), 'src')], + 'CPPPATH': [join(root_dir, 'include'), src_dir], 'library:shared': { 'CPPDEFINES': ['USING_V8_SHARED'] }, |