Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 512 '-include <(skia_sanitizer_blacklist)', # Make every .cpp depend on it. | 512 '-include <(skia_sanitizer_blacklist)', # Make every .cpp depend on it. |
| 513 ], | 513 ], |
| 514 # We want to pass -fsanitize=... to our final link call, | 514 # We want to pass -fsanitize=... to our final link call, |
| 515 # but not to libtool. OTHER_LDFLAGS is passed to both. | 515 # but not to libtool. OTHER_LDFLAGS is passed to both. |
| 516 # To trick GYP into doing what we want, we'll piggyback on | 516 # To trick GYP into doing what we want, we'll piggyback on |
| 517 # LIBRARY_SEARCH_PATHS, producing "-L/usr/lib -fsanitize=...". | 517 # LIBRARY_SEARCH_PATHS, producing "-L/usr/lib -fsanitize=...". |
| 518 # The -L/usr/lib is redundant but innocuous: it's a default path. | 518 # The -L/usr/lib is redundant but innocuous: it's a default path. |
| 519 'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'] , | 519 'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'] , |
| 520 }], | 520 }], |
| 521 ], | 521 ], |
| 522 # Keep these in sync with cflags_cc below | |
| 522 'CLANG_CXX_LIBRARY': 'libc++', | 523 'CLANG_CXX_LIBRARY': 'libc++', |
| 523 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 524 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| 524 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions | 525 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions |
| 525 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti | 526 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti |
| 526 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics | 527 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics |
| 527 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 | 528 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 |
| 528 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden | 529 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden |
| 529 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden | 530 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden |
| 530 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks | 531 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks |
| 531 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings | 532 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings |
| 532 'WARNING_CFLAGS': [ | 533 'WARNING_CFLAGS': [ |
|
mtklein
2016/01/22 16:14:18
One trick I've often considered is that any cflags
bsalomon
2016/01/22 16:25:34
With Herb's change to gyp --std=c++11 is applied t
| |
| 533 '-Wall', | 534 '-Wall', |
| 534 '-Wextra', | 535 '-Wextra', |
| 535 '-Winit-self', | 536 '-Winit-self', |
| 536 '-Wpointer-arith', | 537 '-Wpointer-arith', |
| 537 '-Wsign-compare', | 538 '-Wsign-compare', |
| 538 | 539 |
| 539 '-Wno-unused-parameter', | 540 '-Wno-unused-parameter', |
| 540 ], | 541 ], |
| 541 }, | 542 }, |
| 543 # Keep these in sync with xcode settings above | |
| 544 'cflags_cc': [ | |
| 545 '-std=c++11', | |
| 546 '-fno-rtti', | |
| 547 '-fno-threadsafe-statics', | |
| 548 '-mssse3', | |
| 549 '-fvisibility=hidden', | |
| 550 '-fvisibility-inlines-hidden', | |
| 551 '-Wall', | |
| 552 '-Wextra', | |
| 553 '-Winit-self', | |
| 554 '-Wpointer-arith', | |
| 555 '-Wsign-compare', | |
| 556 '-Wno-unused-parameter', | |
| 557 ], | |
| 542 }, | 558 }, |
| 543 ], | 559 ], |
| 544 | 560 |
| 545 [ 'skia_os == "ios"', | 561 [ 'skia_os == "ios"', |
| 546 { | 562 { |
| 547 'defines': [ | 563 'defines': [ |
| 548 'SK_BUILD_FOR_IOS', | 564 'SK_BUILD_FOR_IOS', |
| 549 ], | 565 ], |
| 550 'conditions' : [ | 566 'conditions' : [ |
| 551 [ 'skia_warnings_as_errors', { | 567 [ 'skia_warnings_as_errors', { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 660 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 676 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 661 }, | 677 }, |
| 662 }], | 678 }], |
| 663 | 679 |
| 664 ], # end 'conditions' | 680 ], # end 'conditions' |
| 665 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 681 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 666 'xcode_settings': { | 682 'xcode_settings': { |
| 667 'SYMROOT': '<(DEPTH)/xcodebuild', | 683 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 668 }, | 684 }, |
| 669 } | 685 } |
| OLD | NEW |