diff options
| author |  mtklein <mtklein@chromium.org> | 2014-10-13 12:32:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-13 12:32:34 -0700 |
| commit | 335a0ae19c3c26a934b2a25c0b8016a453c4b013 (patch) | |
| tree | 289f8914a70f071869f46ffcdbebaf6296d3401c /gyp | |
| parent | 6c07907eaa464ba98b0144ff20ea6989238b6253 (diff) | |
Allow GCC to build Skia on Mac.
GCC doesn't understand -fasm-blocks or -mpascal-strings, but we don't care
about them.
While looking around in Gyp, I noticed a better way to disable warnings about
offsetof so that it doesn't tell us "disabling this warning makes no sense in C"
for every C source file we compile.
BUG=skia:
Review URL: https://codereview.chromium.org/650553002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 4d06ffcc14..d9c048771e 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -506,10 +506,12 @@ 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hidden 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-inlines-hidden + 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-blocks + 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal-strings + 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offsetof 'WARNING_CFLAGS': [ '-Wall', '-Wextra', - '-Wno-invalid-offsetof', '-Wno-unused-parameter', '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at this. ], @@ -551,8 +553,8 @@ 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 'SDKROOT': 'iphoneos', 'TARGETED_DEVICE_FAMILY': '1,2', + 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offsetof 'OTHER_CPLUSPLUSFLAGS': [ - '-Wno-invalid-offsetof', '-fvisibility=hidden', '-fvisibility-inlines-hidden', ], |