Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 3524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3535 'release_optimize%': 's', | 3535 'release_optimize%': 's', |
| 3536 }, | 3536 }, |
| 3537 'ldflags': [ | 3537 'ldflags': [ |
| 3538 # Warn in case of text relocations. | 3538 # Warn in case of text relocations. |
| 3539 '-Wl,--warn-shared-textrel', | 3539 '-Wl,--warn-shared-textrel', |
| 3540 ], | 3540 ], |
| 3541 }], | 3541 }], |
| 3542 ['clang==1', { | 3542 ['clang==1', { |
| 3543 'cflags!': [ | 3543 'cflags!': [ |
| 3544 '-fno-ident', | 3544 '-fno-ident', |
| 3545 ], | 3545 ], |
|
Nico
2014/07/18 18:40:44
Does it work if you add
'cflags': [ '-fno-slp-v
| |
| 3546 }], | 3546 }], |
| 3547 ['profiling==1', { | 3547 ['profiling==1', { |
| 3548 'cflags': [ | 3548 'cflags': [ |
| 3549 '-fno-omit-frame-pointer', | 3549 '-fno-omit-frame-pointer', |
| 3550 '-g', | 3550 '-g', |
| 3551 ], | 3551 ], |
| 3552 'conditions' : [ | 3552 'conditions' : [ |
| 3553 ['profiling_full_stack_frames==1', { | 3553 ['profiling_full_stack_frames==1', { |
| 3554 'cflags': [ | 3554 'cflags': [ |
| 3555 '-fno-inline', | 3555 '-fno-inline', |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3896 # this is worth fixing. | 3896 # this is worth fixing. |
| 3897 '-Wno-c++11-narrowing', | 3897 '-Wno-c++11-narrowing', |
| 3898 | 3898 |
| 3899 # TODO(thakis): Remove, http://crbug.com/263960 | 3899 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3900 '-Wno-reserved-user-defined-literal', | 3900 '-Wno-reserved-user-defined-literal', |
| 3901 | 3901 |
| 3902 # Clang considers the `register` keyword as deprecated, but e.g. | 3902 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3903 # code generated by flex (used in angle) contains that keyword. | 3903 # code generated by flex (used in angle) contains that keyword. |
| 3904 # http://crbug.com/255186 | 3904 # http://crbug.com/255186 |
| 3905 '-Wno-deprecated-register', | 3905 '-Wno-deprecated-register', |
| 3906 | |
| 3907 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed | |
| 3908 # and the fix is in chromium. | |
| 3909 '-fno-slp-vectorize', | |
| 3906 ], | 3910 ], |
| 3907 'cflags!': [ | 3911 'cflags!': [ |
| 3908 # Clang doesn't seem to know know this flag. | 3912 # Clang doesn't seem to know know this flag. |
| 3909 '-mfpmath=sse', | 3913 '-mfpmath=sse', |
| 3910 ], | 3914 ], |
| 3911 'cflags_cc': [ | 3915 'cflags_cc': [ |
| 3912 # See the comment in the Mac section for what it takes to move | 3916 # See the comment in the Mac section for what it takes to move |
| 3913 # this to -std=c++11. | 3917 # this to -std=c++11. |
| 3914 '-std=gnu++11', | 3918 '-std=gnu++11', |
| 3915 ], | 3919 ], |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4736 # e.g. code generated by flex (used in angle) contains that | 4740 # e.g. code generated by flex (used in angle) contains that |
| 4737 # keyword. http://crbug.com/255186 | 4741 # keyword. http://crbug.com/255186 |
| 4738 '-Wno-deprecated-register', | 4742 '-Wno-deprecated-register', |
| 4739 | 4743 |
| 4740 # This warns on selectors from Cocoa headers (-length, -set). | 4744 # This warns on selectors from Cocoa headers (-length, -set). |
| 4741 # cfe-dev is currently discussing the merits of this warning. | 4745 # cfe-dev is currently discussing the merits of this warning. |
| 4742 # TODO(thakis): Reevaluate what to do with this, based one | 4746 # TODO(thakis): Reevaluate what to do with this, based one |
| 4743 # cfe-dev discussion. | 4747 # cfe-dev discussion. |
| 4744 '-Wno-selector-type-mismatch', | 4748 '-Wno-selector-type-mismatch', |
| 4745 ], | 4749 ], |
| 4750 'OTHER_CFLAGS': [ | |
| 4751 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed | |
| 4752 # and the fix is in chromium. | |
| 4753 '-fno-slp-vectorize', | |
| 4754 ], | |
| 4746 | 4755 |
| 4747 'conditions': [ | 4756 'conditions': [ |
| 4748 ['clang_xcode==0', { | 4757 ['clang_xcode==0', { |
| 4749 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', | 4758 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', |
| 4750 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', | 4759 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', |
| 4751 }], | 4760 }], |
| 4752 ], | 4761 ], |
| 4753 }], | 4762 }], |
| 4754 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { | 4763 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { |
| 4755 'OTHER_CFLAGS': [ | 4764 'OTHER_CFLAGS': [ |
| (...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5646 # settings in target dicts. SYMROOT is a special case, because many other | 5655 # settings in target dicts. SYMROOT is a special case, because many other |
| 5647 # Xcode variables depend on it, including variables such as | 5656 # Xcode variables depend on it, including variables such as |
| 5648 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5657 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5649 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5658 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5650 # files to appear (when present) in the UI as actual files and not red | 5659 # files to appear (when present) in the UI as actual files and not red |
| 5651 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5660 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5652 # and therefore SYMROOT, needs to be set at the project level. | 5661 # and therefore SYMROOT, needs to be set at the project level. |
| 5653 'SYMROOT': '<(DEPTH)/xcodebuild', | 5662 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5654 }, | 5663 }, |
| 5655 } | 5664 } |
| OLD | NEW |