diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 11:50:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-21 12:01:46 +0100 |
| commit | 25f6136652d8341ed047e7fc1a450af5bd218ea9 (patch) | |
| tree | 1aaefdeb728884cf07eccd51130ba7438611ce6d /SConstruct | |
| parent | 388eba4e819805cb37ffe18231f53c79102356ae (diff) | |
| download | android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.tar.gz android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.tar.bz2 android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.zip | |
Merge WebKit at r59636: Update v8 to r4660.
Will build and run with current webkit.
Change-Id: I57bae621fd894da363ba84e1757ad09eb7c502b9
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -84,6 +84,7 @@ ANDROID_FLAGS = ['-march=armv7-a', '-finline-limit=64', '-DCAN_USE_VFP_INSTRUCTIONS=1', '-DCAN_USE_ARMV7_INSTRUCTIONS=1', + '-DCAN_USE_UNALIGNED_ACCESSES=1', '-MD'] ANDROID_INCLUDES = [ANDROID_TOP + '/bionic/libc/arch-arm/include', @@ -178,6 +179,9 @@ LIBRARY_FLAGS = { 'CCFLAGS': ['-ansi'], }, 'os:solaris': { + # On Solaris, to get isinf, INFINITY, fpclassify and other macros one + # needs to define __C99FEATURES__. + 'CPPDEFINES': ['__C99FEATURES__'], 'CPPPATH' : ['/usr/local/include'], 'LIBPATH' : ['/usr/local/lib'], 'CCFLAGS': ['-ansi'], @@ -203,7 +207,7 @@ LIBRARY_FLAGS = { 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'] }, 'simulator:arm': { - 'CCFLAGS': ['-m32'], + 'CCFLAGS': ['-m32', '-DCAN_USE_UNALIGNED_ACCESSES=1'], 'LINKFLAGS': ['-m32'] }, 'armvariant:thumb2': { |