Index: build/standalone.gypi |
diff --git a/build/standalone.gypi b/build/standalone.gypi |
index f7ca0a66a9e7d651ca028040f1ab9f912084c8a3..f429e4c26277b282c842e79c5c7a2b8591cb09b7 100644 |
--- a/build/standalone.gypi |
+++ b/build/standalone.gypi |
@@ -30,6 +30,7 @@ |
{ |
'variables': { |
'component%': 'static_library', |
+ 'clang%': 0, |
Jakob Kummerow
2013/06/28 09:48:14
What's this needed for?
jochen (gone - plz use gerrit)
2013/06/28 10:09:15
it's not really needed in this patch, so I'll remo
|
'visibility%': 'hidden', |
'v8_enable_backtrace%': 0, |
'msvs_multi_core_compile%': '1', |
@@ -65,6 +66,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 \ |
@@ -81,8 +89,19 @@ |
'arm_fpu%': 'vfpv3', |
'arm_float_abi%': 'default', |
'arm_thumb': 'default', |
+ |
+ 'conditions': [ |
+ ['OS == "win"', { |
Jakob Kummerow
2013/06/28 09:48:14
Please merge this into the existing 'conditions' s
jochen (gone - plz use gerrit)
2013/06/28 10:09:15
Done.
|
+ 'os_posix%': 0, |
+ }, { |
+ 'os_posix%': 1, |
+ }], |
+ ], |
}, |
'target_defaults': { |
+ 'variables': { |
+ 'v8_code%': '<(v8_code)', |
+ }, |
'default_configuration': 'Debug', |
'configurations': { |
'Debug': { |
@@ -92,6 +111,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" \ |