GYP fixes: -Werror, snapshot.log, want_separate_host_toolset detection

Review URL: http://codereview.chromium.org/7658011

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8962 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 5d634be4
...@@ -32,25 +32,30 @@ ...@@ -32,25 +32,30 @@
'visibility%': 'hidden', 'visibility%': 'hidden',
'msvs_multi_core_compile%': '1', 'msvs_multi_core_compile%': '1',
'variables': { 'variables': {
'conditions': [ 'variables': {
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'conditions': [
# This handles the Linux platforms we generally deal with. Anything [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# else gets passed through, which probably won't work very well; such # This handles the Linux platforms we generally deal with. Anything
# hosts should pass an explicit target_arch to gyp. # else gets passed through, which probably won't work very well; such
'host_arch%': # hosts should pass an explicit target_arch to gyp.
'<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")', 'host_arch%':
}, { # OS!="linux" and OS!="freebsd" and OS!="openbsd" '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")',
'host_arch%': 'ia32', }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd"
}], 'host_arch%': 'ia32',
], }],
],
},
'host_arch%': '<(host_arch)',
'target_arch%': '<(host_arch)',
'v8_target_arch%': '<(target_arch)',
}, },
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
'target_arch%': '<(host_arch)', 'target_arch%': '<(target_arch)',
'v8_target_arch%': '<(target_arch)', 'v8_target_arch%': '<(v8_target_arch)',
'v8_enable_debugger_support%': 1, 'v8_enable_debugger_support%': 1,
'conditions': [ 'conditions': [
['(target_arch=="arm" and host_arch!="arm") or \ ['(v8_target_arch=="arm" and host_arch!="arm") or \
(target_arch=="x64" and host_arch!="x64")', { (v8_target_arch=="x64" and host_arch!="x64")', {
'want_separate_host_toolset': 1, 'want_separate_host_toolset': 1,
}, { }, {
'want_separate_host_toolset': 0, 'want_separate_host_toolset': 0,
...@@ -80,8 +85,9 @@ ...@@ -80,8 +85,9 @@
'conditions': [ 'conditions': [
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': { 'target_defaults': {
'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions', 'cflags': [ '-Wall', '-Werror', '-W', '-Wno-unused-parameter',
'-pedantic' ], '-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
'-fno-exceptions', '-pedantic' ],
'ldflags': [ '-pthread', ], 'ldflags': [ '-pthread', ],
'conditions': [ 'conditions': [
[ 'target_arch=="ia32"', { [ 'target_arch=="ia32"', {
......
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
'Debug': { 'Debug': {
'defines': [ 'defines': [
'DEBUG', 'DEBUG',
'_DEBUG',
'ENABLE_DISASSEMBLER', 'ENABLE_DISASSEMBLER',
'V8_ENABLE_CHECKS', 'V8_ENABLE_CHECKS',
'OBJECT_PRINT', 'OBJECT_PRINT',
...@@ -372,7 +371,10 @@ ...@@ -372,7 +371,10 @@
'<(INTERMEDIATE_DIR)/snapshot.cc', '<(INTERMEDIATE_DIR)/snapshot.cc',
], ],
'variables': { 'variables': {
'mksnapshot_flags': [], 'mksnapshot_flags': [
'--log-snapshot-positions',
'--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
],
}, },
'conditions': [ 'conditions': [
['v8_target_arch=="arm"', { ['v8_target_arch=="arm"', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment