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

[build] Fix default for target_arch

Browse Source 
Fix after https://codereview.chromium.org/2028623002/

BUG=chromium:474921, chromium:616032
TBR=vogelheim@chromium.org, jochen@chromium.org
NOTRY=true

Review-Url: https://codereview.chromium.org/2040803005
Cr-Commit-Position: refs/heads/master@{#36733}
This commit is contained in:
machenbach 2016-06-06 02:10:23 -07:00 committed by Commit bot
parent e33b7421f7
commit 9dcb67dd17
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gypfiles/standalone.gypi
View File

@ -49,20 +49,24 @@
'variables': { 'variables': {
'variables': { 'variables': {
'variables': { 'variables': {
'conditions': [ 'variables': {
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \ 'conditions': [
OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \
# This handles the Unix platforms we generally deal with. OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', {
# Anything else gets passed through, which probably won't work # This handles the Unix platforms we generally deal with.
# very well; such hosts should pass an explicit target_arch # Anything else gets passed through, which probably won't work
# to gyp. # very well; such hosts should pass an explicit target_arch
'host_arch%': '<!pymod_do_main(detect_v8_host_arch)', # to gyp.
}, { 'host_arch%': '<!pymod_do_main(detect_v8_host_arch)',
# OS!="linux" and OS!="freebsd" and OS!="openbsd" and }, {
# OS!="netbsd" and OS!="mac" and OS!="aix" # OS!="linux" and OS!="freebsd" and OS!="openbsd" and
'host_arch%': 'ia32', # OS!="netbsd" and OS!="mac" and OS!="aix"
}], 'host_arch%': 'ia32',
], }],
],
},
'host_arch%': '<(host_arch)',
'target_arch%': '<(host_arch)',
# By default we build against a stable sysroot image to avoid # By default we build against a stable sysroot image to avoid
# depending on the packages installed on the local machine. Set this # depending on the packages installed on the local machine. Set this
@ -71,7 +75,7 @@
'use_sysroot%': 1, 'use_sysroot%': 1,
}, },
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
'target_arch%': '<(host_arch)', 'target_arch%': '<(target_arch)',
'use_sysroot%': '<(use_sysroot)', 'use_sysroot%': '<(use_sysroot)',
'base_dir%': '<!(cd <(DEPTH) && python -c "import os; print os.getcwd()")', 'base_dir%': '<!(cd <(DEPTH) && python -c "import os; print os.getcwd()")',