diff --git a/3rdParty/V8-4.3.61/build/standalone.gypi b/3rdParty/V8-4.3.61/build/standalone.gypi index 62951b15e7..ed3f7c204c 100644 --- a/3rdParty/V8-4.3.61/build/standalone.gypi +++ b/3rdParty/V8-4.3.61/build/standalone.gypi @@ -324,6 +324,7 @@ ], }, }], + ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH']}], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="aix"', { 'target_defaults': { @@ -335,11 +336,12 @@ '-pthread', '-fno-exceptions', '-pedantic', + '-m64', # Don't warn about the "struct foo f = {0};" initialization pattern. '-Wno-missing-field-initializers', ], 'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ], - 'ldflags': [ '-pthread', ], + 'ldflags': [ '-pthread', '-march=x86-64', '-m64'], 'conditions': [ [ 'host_arch=="ppc64" and OS!="aix"', { 'cflags': [ '-mminimal-toc' ], diff --git a/3rdParty/V8-4.3.61/build/toolchain.gypi b/3rdParty/V8-4.3.61/build/toolchain.gypi index c544a71cef..0fa4f47cea 100644 --- a/3rdParty/V8-4.3.61/build/toolchain.gypi +++ b/3rdParty/V8-4.3.61/build/toolchain.gypi @@ -897,6 +897,7 @@ }, }, }], + ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH'], 'ldflags': ['-march=x86-64', '-m64']}], ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ v8_target_arch=="ia32"', { @@ -974,7 +975,7 @@ or OS=="netbsd" or OS=="qnx" or OS=="aix"', { 'conditions': [ [ 'v8_no_strict_aliasing==1', { - 'cflags': [ '-fno-strict-aliasing' ], + 'cflags': [ '-fno-strict-aliasing -m64' ], }], ], # conditions }], diff --git a/3rdParty/V8-4.3.61/src/d8.gyp b/3rdParty/V8-4.3.61/src/d8.gyp index 61d1b4c75a..7843813aca 100644 --- a/3rdParty/V8-4.3.61/src/d8.gyp +++ b/3rdParty/V8-4.3.61/src/d8.gyp @@ -60,6 +60,7 @@ 'libraries': [ '-lreadline', ], 'sources': [ 'd8-readline.cc' ], }], + ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH'], 'ldflags': ['-march=x86-64', '-m64']}], ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ or OS=="openbsd" or OS=="solaris" or OS=="android" \ or OS=="qnx" or OS=="aix")', { diff --git a/3rdParty/V8-4.3.61/third_party/icu/icu.gyp b/3rdParty/V8-4.3.61/third_party/icu/icu.gyp index 910fe68e6f..295d164020 100644 --- a/3rdParty/V8-4.3.61/third_party/icu/icu.gyp +++ b/3rdParty/V8-4.3.61/third_party/icu/icu.gyp @@ -37,7 +37,8 @@ 'U_STATIC_IMPLEMENTATION', ], }], - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ + ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH'], 'cflags': ['-m64']}], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS!="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ (target_arch=="arm" or target_arch=="ia32" or \ target_arch=="mipsel")', { diff --git a/3rdParty/V8-4.3.61/tools/gyp/v8.gyp b/3rdParty/V8-4.3.61/tools/gyp/v8.gyp index 1e73441546..e9bafcc46c 100644 --- a/3rdParty/V8-4.3.61/tools/gyp/v8.gyp +++ b/3rdParty/V8-4.3.61/tools/gyp/v8.gyp @@ -1518,7 +1518,8 @@ ]}, ], ['OS=="solaris"', { - 'link_settings': { + 'defines': ['_GLIBCXX_USE_C99_MATH'], + 'link_settings': { 'libraries': [ '-lnsl -lrt', ]},