summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorsdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 20:53:00 +0000
committersdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 20:53:00 +0000
commit7e0fe491658f53994ac50b6a682d4b0180837316 (patch)
tree4b58b42e610be4cd646189172fc7e21f5e575600 /build/common.gypi
parent3545f7df3b4b25ec96589142f7d8a1d4e074737a (diff)
downloadchromium_src-7e0fe491658f53994ac50b6a682d4b0180837316.zip
chromium_src-7e0fe491658f53994ac50b6a682d4b0180837316.tar.gz
chromium_src-7e0fe491658f53994ac50b6a682d4b0180837316.tar.bz2
Fix the condition to disable the warning when building with Xcode
The warning -Wshorten-64-to-32 is automatically enabled by Xcode 5.1 when building for 64-bit architecture. Disable when the generator is Xcode, not ninja. BUG=359107 Review URL: https://codereview.chromium.org/231023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 0b63d83..dc34156 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4380,7 +4380,7 @@
],
}],
['OS=="ios" and target_subarch!="arm32" and \
- "<(GENERATOR)"=="ninja"', {
+ "<(GENERATOR)"=="xcode"', {
'OTHER_CFLAGS': [
# TODO(ios): when building Chrome for iOS on 64-bit platform
# with Xcode, the -Wshorted-64-to-32 warning is automatically