Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Force V8 solaris builds to 64 bits

This commit is contained in:
Wilfried Goesgens 2016-02-19 12:38:48 +01:00
parent baa0999ee6
commit b440ed74f1
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/V8-4.3.61/build/standalone.gypi vendored
View File

@ -324,6 +324,7 @@
], ],
}, },
}], }],
['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH']}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd" or OS=="aix"', { or OS=="netbsd" or OS=="aix"', {
'target_defaults': { 'target_defaults': {
@ -335,11 +336,12 @@
'-pthread', '-pthread',
'-fno-exceptions', '-fno-exceptions',
'-pedantic', '-pedantic',
'-m64',
# Don't warn about the "struct foo f = {0};" initialization pattern. # Don't warn about the "struct foo f = {0};" initialization pattern.
'-Wno-missing-field-initializers', '-Wno-missing-field-initializers',
], ],
'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ], 'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
'ldflags': [ '-pthread', ], 'ldflags': [ '-pthread', '-march=x86-64', '-m64'],
'conditions': [ 'conditions': [
[ 'host_arch=="ppc64" and OS!="aix"', { [ 'host_arch=="ppc64" and OS!="aix"', {
'cflags': [ '-mminimal-toc' ], 'cflags': [ '-mminimal-toc' ],

3
3rdParty/V8-4.3.61/build/toolchain.gypi vendored
View File

@ -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" \ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
v8_target_arch=="ia32"', { v8_target_arch=="ia32"', {
@ -974,7 +975,7 @@
or OS=="netbsd" or OS=="qnx" or OS=="aix"', { or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
'conditions': [ 'conditions': [
[ 'v8_no_strict_aliasing==1', { [ 'v8_no_strict_aliasing==1', {
'cflags': [ '-fno-strict-aliasing' ], 'cflags': [ '-fno-strict-aliasing -m64' ],
}], }],
], # conditions ], # conditions
}], }],

1
3rdParty/V8-4.3.61/src/d8.gyp vendored
View File

@ -60,6 +60,7 @@
'libraries': [ '-lreadline', ], 'libraries': [ '-lreadline', ],
'sources': [ 'd8-readline.cc' ], '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" \ ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
or OS=="openbsd" or OS=="solaris" or OS=="android" \ or OS=="openbsd" or OS=="solaris" or OS=="android" \
or OS=="qnx" or OS=="aix")', { or OS=="qnx" or OS=="aix")', {

3
3rdParty/V8-4.3.61/third_party/icu/icu.gyp vendored
View File

@ -37,7 +37,8 @@
'U_STATIC_IMPLEMENTATION', '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 \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
(target_arch=="arm" or target_arch=="ia32" or \ (target_arch=="arm" or target_arch=="ia32" or \
target_arch=="mipsel")', { target_arch=="mipsel")', {

3
3rdParty/V8-4.3.61/tools/gyp/v8.gyp vendored
View File

@ -1518,7 +1518,8 @@
]}, ]},
], ],
['OS=="solaris"', { ['OS=="solaris"', {
'link_settings': { 'defines': ['_GLIBCXX_USE_C99_MATH'],
'link_settings': {
'libraries': [ 'libraries': [
'-lnsl -lrt', '-lnsl -lrt',
]}, ]},