summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-16 14:20:40 +0100
committerBen Murdoch <benm@google.com>2011-05-18 16:35:26 +0100
commitb8e0da25ee8efac3bb05cd6b2730aafbd96119f4 (patch)
treec5ef7652343a7e4b55601fa0a4c94cf46ba09585 /SConstruct
parent086aeeaae12517475c22695a200be45495516549 (diff)
downloadandroid_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.tar.gz
android_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.tar.bz2
android_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.zip
Update V8 to r6387 as required by WebKit r76408
Change-Id: Icfc5385b0996bd592f8b1ac8cbb44767ee09f1f6
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct20
1 files changed, 20 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index f6d1385a..e84db844 100644
--- a/SConstruct
+++ b/SConstruct
@@ -124,6 +124,9 @@ LIBRARY_FLAGS = {
},
'debuggersupport:on': {
'CPPDEFINES': ['ENABLE_DEBUGGER_SUPPORT'],
+ },
+ 'inspector:on': {
+ 'CPPDEFINES': ['INSPECTOR'],
}
},
'gcc': {
@@ -229,6 +232,9 @@ LIBRARY_FLAGS = {
},
'prof:oprofile': {
'CPPDEFINES': ['ENABLE_OPROFILE_AGENT']
+ },
+ 'gdbjit:on': {
+ 'CPPDEFINES': ['ENABLE_GDB_JIT_INTERFACE']
}
},
'msvc': {
@@ -663,6 +669,8 @@ def GuessVisibility(os, toolchain):
if os == 'win32' and toolchain == 'gcc':
# MinGW can't do it.
return 'default'
+ elif os == 'solaris':
+ return 'default'
else:
return 'hidden'
@@ -704,6 +712,11 @@ SIMPLE_OPTIONS = {
'default': 'off',
'help': 'enable profiling of build target'
},
+ 'gdbjit': {
+ 'values': ['on', 'off'],
+ 'default': 'off',
+ 'help': 'enable GDB JIT interface'
+ },
'library': {
'values': ['static', 'shared'],
'default': 'static',
@@ -734,6 +747,11 @@ SIMPLE_OPTIONS = {
'default': 'on',
'help': 'enable debugging of JavaScript code'
},
+ 'inspector': {
+ 'values': ['on', 'off'],
+ 'default': 'off',
+ 'help': 'enable inspector features'
+ },
'soname': {
'values': ['on', 'off'],
'default': 'off',
@@ -870,6 +888,8 @@ def VerifyOptions(env):
return False
if env['os'] == 'win32' and env['library'] == 'shared' and env['prof'] == 'on':
Abort("Profiling on windows only supported for static library.")
+ if env['gdbjit'] == 'on' and (env['os'] != 'linux' or (env['arch'] != 'ia32' and env['arch'] != 'x64')):
+ Abort("GDBJIT interface is supported only for Intel-compatible (ia32 or x64) Linux target.")
if env['prof'] == 'oprofile' and env['os'] != 'linux':
Abort("OProfile is only supported on Linux.")
if env['os'] == 'win32' and env['soname'] == 'on':