diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-25 10:26:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-25 16:24:42 +0100 |
| commit | e0cee9b3ed82e2391fd85d118aeaa4ea361c687d (patch) | |
| tree | 31c7963cf0dfc88be29e765884e1f235076c03a4 /SConstruct | |
| parent | 1e0659c275bb392c045087af4f6b0d7565cb3d77 (diff) | |
| download | android_external_v8-e0cee9b3ed82e2391fd85d118aeaa4ea361c687d.tar.gz android_external_v8-e0cee9b3ed82e2391fd85d118aeaa4ea361c687d.tar.bz2 android_external_v8-e0cee9b3ed82e2391fd85d118aeaa4ea361c687d.zip | |
Update V8 to r7079 as required by WebKit r80534.
Change-Id: I487c152e485d5a40b68997d7c0d2f1fba5da0834
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -663,8 +663,8 @@ def GuessToolchain(os): def GuessVisibility(os, toolchain): - if os == 'win32' and toolchain == 'gcc': - # MinGW can't do it. + if (os == 'win32' or os == 'cygwin') and toolchain == 'gcc': + # MinGW / Cygwin can't do it. return 'default' elif os == 'solaris': return 'default' @@ -685,7 +685,7 @@ SIMPLE_OPTIONS = { 'help': 'the toolchain to use (%s)' % TOOLCHAIN_GUESS }, 'os': { - 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd', 'solaris'], + 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd', 'solaris', 'cygwin'], 'default': OS_GUESS, 'help': 'the os to build for (%s)' % OS_GUESS }, @@ -890,7 +890,7 @@ 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')): + if env['gdbjit'] == 'on' and (env['os'] != 'linux' or (env['arch'] != 'ia32' and env['arch'] != 'x64' and env['arch'] != 'arm')): Abort("GDBJIT interface is supported only for Intel-compatible (ia32 or x64) Linux target.") if env['os'] == 'win32' and env['soname'] == 'on': Abort("Shared Object soname not applicable for Windows.") |