aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-25 19:14:14 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-25 19:14:14 +0000
commit2e91d7adb7cbb5f5edccef1b5d1e71c901a697e2 (patch)
treeac5eb14bef2719a18c8c10a176115ec21483c9b0 /gyp
parentf585c451731643afe5885b273ca2c268187d8dee (diff)
Disable warning emitted in libjpg build
Review URL: https://codereview.appspot.com/6573047 git-svn-id: http://skia.googlecode.com/svn/trunk@5673 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/libjpeg.gyp7
1 files changed, 6 insertions, 1 deletions
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index 77bc276c12..5780b27e44 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -80,7 +80,12 @@
],
},
'conditions': [
- ['OS!="win"', {'product_name': 'jpeg'}],
+ ['OS!="win"', {
+ 'product_name': 'jpeg',
+ 'cflags': [
+ '-Wno-main', # supresses warnings about naming things "main"
+ ],
+ }],
['OS=="android"', {
'cflags!': [
'-fno-rtti', # supresses warnings about invalid option of non-C++ code