| 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 }, | 3535 }, |
| 3536 'ldflags': [ | 3536 'ldflags': [ |
| 3537 # Warn in case of text relocations. | 3537 # Warn in case of text relocations. |
| 3538 '-Wl,--warn-shared-textrel', | 3538 '-Wl,--warn-shared-textrel', |
| 3539 ], | 3539 ], |
| 3540 }], | 3540 }], |
| 3541 ['clang==1', { | 3541 ['clang==1', { |
| 3542 'cflags!': [ | 3542 'cflags!': [ |
| 3543 '-fno-ident', | 3543 '-fno-ident', |
| 3544 ], | 3544 ], |
| 3545 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed |
| 3546 # and the fix is in chromium. |
| 3547 'cflags': [ '-fno-slp-vectorize', ], |
| 3545 }], | 3548 }], |
| 3546 ['profiling==1', { | 3549 ['profiling==1', { |
| 3547 'cflags': [ | 3550 'cflags': [ |
| 3548 '-fno-omit-frame-pointer', | 3551 '-fno-omit-frame-pointer', |
| 3549 '-g', | 3552 '-g', |
| 3550 ], | 3553 ], |
| 3551 'conditions' : [ | 3554 'conditions' : [ |
| 3552 ['profiling_full_stack_frames==1', { | 3555 ['profiling_full_stack_frames==1', { |
| 3553 'cflags': [ | 3556 'cflags': [ |
| 3554 '-fno-inline', | 3557 '-fno-inline', |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3895 # this is worth fixing. | 3898 # this is worth fixing. |
| 3896 '-Wno-c++11-narrowing', | 3899 '-Wno-c++11-narrowing', |
| 3897 | 3900 |
| 3898 # TODO(thakis): Remove, http://crbug.com/263960 | 3901 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3899 '-Wno-reserved-user-defined-literal', | 3902 '-Wno-reserved-user-defined-literal', |
| 3900 | 3903 |
| 3901 # Clang considers the `register` keyword as deprecated, but e.g. | 3904 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3902 # code generated by flex (used in angle) contains that keyword. | 3905 # code generated by flex (used in angle) contains that keyword. |
| 3903 # http://crbug.com/255186 | 3906 # http://crbug.com/255186 |
| 3904 '-Wno-deprecated-register', | 3907 '-Wno-deprecated-register', |
| 3905 | |
| 3906 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed | |
| 3907 # and the fix is in chromium. | |
| 3908 '-fno-slp-vectorize', | |
| 3909 ], | 3908 ], |
| 3910 'cflags!': [ | 3909 'cflags!': [ |
| 3911 # Clang doesn't seem to know know this flag. | 3910 # Clang doesn't seem to know know this flag. |
| 3912 '-mfpmath=sse', | 3911 '-mfpmath=sse', |
| 3913 ], | 3912 ], |
| 3914 'cflags_cc': [ | 3913 'cflags_cc': [ |
| 3915 # See the comment in the Mac section for what it takes to move | 3914 # See the comment in the Mac section for what it takes to move |
| 3916 # this to -std=c++11. | 3915 # this to -std=c++11. |
| 3917 '-std=gnu++11', | 3916 '-std=gnu++11', |
| 3918 ], | 3917 ], |
| (...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5654 # settings in target dicts. SYMROOT is a special case, because many other | 5653 # settings in target dicts. SYMROOT is a special case, because many other |
| 5655 # Xcode variables depend on it, including variables such as | 5654 # Xcode variables depend on it, including variables such as |
| 5656 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5655 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5657 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5656 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5658 # files to appear (when present) in the UI as actual files and not red | 5657 # files to appear (when present) in the UI as actual files and not red |
| 5659 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5658 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5660 # and therefore SYMROOT, needs to be set at the project level. | 5659 # and therefore SYMROOT, needs to be set at the project level. |
| 5661 'SYMROOT': '<(DEPTH)/xcodebuild', | 5660 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5662 }, | 5661 }, |
| 5663 } | 5662 } |
| OLD | NEW |