Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
| index 8221c94680a645a68b91927d83276065b042fb69..6b175bb3d1d6a704697f4a8f1b1b5514f4f3c26f 100644 |
| --- a/gyp/common_conditions.gypi |
| +++ b/gyp/common_conditions.gypi |
| @@ -471,6 +471,26 @@ |
| [ 'skia_os == "mac"', |
| { |
| + 'variables': { |
| + 'common_c_and_cpp_flags': [ |
| + '-mssse3', |
| + '-fvisibility=hidden', |
| + '-fvisibility-inlines-hidden', |
| + '-Wall', |
| + '-Wextra', |
| + '-Winit-self', |
| + '-Wpointer-arith', |
| + '-Wsign-compare', |
| + '-Wno-unused-parameter', |
| + ], |
| + 'common_cpp_flags': [ |
| + '-fno-threadsafe-statics', |
|
bsalomon
2016/01/22 18:26:24
wasn't totally sure which list this belonged in
mtklein
2016/01/22 18:45:21
Either place seems fine to me if it works, but I t
|
| + '-fno-exceptions', |
| + '-fno-rtti', |
| + '-std=c++11', |
| + '-stdlib=libc++' |
| + ], |
| + }, |
| 'defines': [ 'SK_BUILD_FOR_MAC' ], |
| 'conditions': [ |
| # ANGLE for mac hits -Wunneeded-internal-declaration if this isn't set. |
| @@ -519,26 +539,22 @@ |
| 'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'], |
| }], |
| ], |
| - 'CLANG_CXX_LIBRARY': 'libc++', |
| - 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| - 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions |
| - 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti |
| - 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics |
| - '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 |
| - 'WARNING_CFLAGS': [ |
| - '-Wall', |
| - '-Wextra', |
| - '-Winit-self', |
| - '-Wpointer-arith', |
| - '-Wsign-compare', |
| - |
| - '-Wno-unused-parameter', |
| + 'OTHER_CPLUSPLUSFLAGS': [ |
|
mtklein
2016/01/22 18:45:21
# Used by Ninja and XCode.
bsalomon
2016/01/22 20:03:05
Done.
|
| + '<@(common_cpp_flags)', |
| + '<@(common_c_and_cpp_flags)', |
| + ], |
| + 'OTHER_CFLAGS': [ |
| + '<@(common_c_and_cpp_flags)', |
| ], |
| }, |
| + 'cflags': [ |
|
mtklein
2016/01/22 18:45:21
# Used by CMake.
bsalomon
2016/01/22 20:03:05
Done.
|
| + '<@(common_c_and_cpp_flags)', |
| + ], |
| + 'cflags_cc': [ |
| + '<@(common_cpp_flags)', |
| + ], |
| }, |
| ], |