mirror of https://gitee.com/bigwinds/arangodb
Force V8 solaris builds to 64 bits
This commit is contained in:
parent
baa0999ee6
commit
b440ed74f1
|
@ -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' ],
|
||||
|
|
|
@ -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
|
||||
}],
|
||||
|
|
|
@ -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")', {
|
||||
|
|
|
@ -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")', {
|
||||
|
|
|
@ -1518,7 +1518,8 @@
|
|||
]},
|
||||
],
|
||||
['OS=="solaris"', {
|
||||
'link_settings': {
|
||||
'defines': ['_GLIBCXX_USE_C99_MATH'],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lnsl -lrt',
|
||||
]},
|
||||
|
|
Loading…
Reference in New Issue