Commit 6eed147d authored by jochen's avatar jochen Committed by Commit bot

Move C++ flags for Android to cxxflags section

BUG=v8:3693
R=ulan@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/752063002

Cr-Commit-Position: refs/heads/master@{#25505}
parent 39d0b854
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
], ],
}, # Release }, # Release
}, # configurations }, # configurations
'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter', 'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter'],
'-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions', 'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions',
# Note: Using -std=c++0x will define __STRICT_ANSI__, which in # Note: Using -std=c++0x will define __STRICT_ANSI__, which
# turn will leave out some template stuff for 'long long'. What # in turn will leave out some template stuff for 'long
# we want is -std=c++11, but this is not supported by GCC 4.6 or # long'. What we want is -std=c++11, but this is not
# Xcode 4.2 # supported by GCC 4.6 or Xcode 4.2
'-std=gnu++0x' ], '-std=gnu++0x' ],
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {
'cflags!': [ 'cflags!': [
...@@ -93,11 +93,13 @@ ...@@ -93,11 +93,13 @@
'-fno-short-enums', '-fno-short-enums',
'-finline-limit=64', '-finline-limit=64',
'-Wa,--noexecstack', '-Wa,--noexecstack',
'-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings.
# Note: This include is in cflags to ensure that it comes after # Note: This include is in cflags to ensure that it comes after
# all of the includes. # all of the includes.
'-I<(android_include)', '-I<(android_include)',
], ],
'cflags_cc': [
'-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings.
],
'defines': [ 'defines': [
'ANDROID', 'ANDROID',
#'__GNU_SOURCE=1', # Necessary for clone() #'__GNU_SOURCE=1', # Necessary for clone()
......
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