Introduce a notion of "v8_code" in gyp config files.
This allows for compiling third-party code (such as ICU) with less strict flags. BUG=v8:2745 R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/18181006 Patch from Jochen Eisinger <jochen@chromium.org>. git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15389 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
ae8fee5aca
commit
2fb7ab5530
@ -65,6 +65,13 @@
|
||||
'target_arch%': '<(target_arch)',
|
||||
'v8_target_arch%': '<(v8_target_arch)',
|
||||
'werror%': '-Werror',
|
||||
|
||||
# .gyp files or targets should set v8_code to 1 if they build V8 specific
|
||||
# code, as opposed to external code. This variable is used to control such
|
||||
# things as the set of warnings to enable, and whether warnings are treated
|
||||
# as errors.
|
||||
'v8_code%': 0,
|
||||
|
||||
'conditions': [
|
||||
['(v8_target_arch=="arm" and host_arch!="arm") or \
|
||||
(v8_target_arch=="mipsel" and host_arch!="mipsel") or \
|
||||
@ -74,6 +81,11 @@
|
||||
}, {
|
||||
'want_separate_host_toolset': 0,
|
||||
}],
|
||||
['OS == "win"', {
|
||||
'os_posix%': 0,
|
||||
}, {
|
||||
'os_posix%': 1,
|
||||
}],
|
||||
],
|
||||
# Default ARM variable settings.
|
||||
'armv7%': 'default',
|
||||
@ -83,6 +95,9 @@
|
||||
'arm_thumb': 'default',
|
||||
},
|
||||
'target_defaults': {
|
||||
'variables': {
|
||||
'v8_code%': '<(v8_code)',
|
||||
},
|
||||
'default_configuration': 'Debug',
|
||||
'configurations': {
|
||||
'Debug': {
|
||||
@ -92,6 +107,29 @@
|
||||
# Xcode insists on this empty entry.
|
||||
},
|
||||
},
|
||||
'target_conditions': [
|
||||
['v8_code == 0', {
|
||||
'conditions': [
|
||||
['os_posix == 1 and OS != "mac"', {
|
||||
'cflags!': [
|
||||
'-Werror',
|
||||
],
|
||||
}],
|
||||
['OS == "mac"', {
|
||||
'xcode_settings': {
|
||||
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror
|
||||
},
|
||||
}],
|
||||
['OS == "win"', {
|
||||
'msvs_settings': {
|
||||
'VCCLCompilerTool': {
|
||||
'WarnAsError': 'false',
|
||||
},
|
||||
},
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
||||
|
@ -26,6 +26,9 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
},
|
||||
'includes': ['../build/common.gypi'],
|
||||
'targets': [
|
||||
{
|
||||
|
@ -26,6 +26,9 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
},
|
||||
'includes': ['../build/common.gypi'],
|
||||
'target_defaults': {
|
||||
'type': 'executable',
|
||||
|
@ -26,12 +26,13 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'includes': ['../build/common.gypi'],
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
'console%': '',
|
||||
# Enable support for Intel VTune. Supported on ia32/x64 only
|
||||
'v8_enable_vtunejit%': 0,
|
||||
},
|
||||
'includes': ['../build/common.gypi'],
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'd8',
|
||||
|
3
src/third_party/vtune/v8vtune.gyp
vendored
3
src/third_party/vtune/v8vtune.gyp
vendored
@ -26,6 +26,9 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
},
|
||||
'includes': ['../../../build/common.gypi'],
|
||||
'targets': [
|
||||
{
|
||||
|
@ -26,10 +26,11 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'includes': ['../../build/common.gypi'],
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
'generated_file': '<(SHARED_INTERMEDIATE_DIR)/resources.cc',
|
||||
},
|
||||
'includes': ['../../build/common.gypi'],
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'cctest',
|
||||
|
@ -26,6 +26,9 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
{
|
||||
'variables': {
|
||||
'v8_code': 1,
|
||||
},
|
||||
'includes': ['../../build/common.gypi'],
|
||||
'targets': [
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user