AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Third attempt to fix ARM cross-compile build

Browse Source 
Review URL: http://codereview.chromium.org/7620009

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8899 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2011-08-11 13:58:28 +00:00
parent bb81895595
commit 64bd51b8dd
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/gyp/v8.gyp
View File

@ -319,11 +319,14 @@
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
['v8_target_arch=="arm" and host_arch=="x64"', {
'target_conditions': [
['_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['component=="shared_library"', {
'conditions': [
['OS=="win"', {
@ -429,11 +432,14 @@
'conditions': [
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
['v8_target_arch=="arm" and host_arch=="x64"', {
'target_conditions': [
['_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
'dependencies': ['js2c#host'],
@ -748,12 +754,16 @@
'conditions': [
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['host_arch=="x64" and _toolset=="host"', {
['host_arch=="x64"', {
'target_conditions': [
['_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
],
}],
['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
'sources': [
'../../src/ia32/assembler-ia32-inl.h',
@ -993,11 +1003,14 @@
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
['v8_target_arch=="arm" and host_arch=="x64"', {
'target_conditions': [
['_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['v8_compress_startup_data=="bz2"', {
'libraries': [
'-lbz2',
@ -1065,12 +1078,15 @@
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
['v8_target_arch=="arm" and host_arch=="x64"', {
'target_conditions': [
['_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
],
'link_settings': {
'libraries': [
'-lv8',