| 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 3213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3224 # TODO(phajdan.jr): Should we enable this for all of POSIX? | 3224 # TODO(phajdan.jr): Should we enable this for all of POSIX? |
| 3225 'defines': ['_GLIBCXX_DEBUG=1',], | 3225 'defines': ['_GLIBCXX_DEBUG=1',], |
| 3226 }], | 3226 }], |
| 3227 ['release_valgrind_build==0', { | 3227 ['release_valgrind_build==0', { |
| 3228 'xcode_settings': { | 3228 'xcode_settings': { |
| 3229 'OTHER_CFLAGS': [ | 3229 'OTHER_CFLAGS': [ |
| 3230 '-fstack-protector-all', # Implies -fstack-protector | 3230 '-fstack-protector-all', # Implies -fstack-protector |
| 3231 ], | 3231 ], |
| 3232 }, | 3232 }, |
| 3233 }], | 3233 }], |
| 3234 ['clang==1', { |
| 3235 'cflags': [ |
| 3236 # Allow comparing the address of references and 'this' against 0 |
| 3237 # in debug builds. Technically, these can never be null in |
| 3238 # well-defined C/C++ and Clang can optimize such checks away in |
| 3239 # release builds, but they may be used in asserts in debug builds. |
| 3240 '-Wno-undefined-bool-conversion', |
| 3241 '-Wno-tautological-undefined-compare', |
| 3242 ], |
| 3243 'xcode_settings': { |
| 3244 'OTHER_CFLAGS': [ |
| 3245 '-Wno-undefined-bool-conversion', |
| 3246 '-Wno-tautological-undefined-compare', |
| 3247 ], |
| 3248 }, |
| 3249 'msvs_settings': { |
| 3250 'VCCLCompilerTool': { |
| 3251 'AdditionalOptions': [ |
| 3252 '-Wno-undefined-bool-conversion', |
| 3253 '-Wno-tautological-undefined-compare', |
| 3254 ], |
| 3255 }, |
| 3256 }, |
| 3257 }], |
| 3234 ], | 3258 ], |
| 3235 }, | 3259 }, |
| 3236 'Release_Base': { | 3260 'Release_Base': { |
| 3237 'abstract': 1, | 3261 'abstract': 1, |
| 3238 'defines': [ | 3262 'defines': [ |
| 3239 'NDEBUG', | 3263 'NDEBUG', |
| 3240 ], | 3264 ], |
| 3241 'xcode_settings': { | 3265 'xcode_settings': { |
| 3242 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip | 3266 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
| 3243 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 3267 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| (...skipping 2439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5683 # settings in target dicts. SYMROOT is a special case, because many other | 5707 # settings in target dicts. SYMROOT is a special case, because many other |
| 5684 # Xcode variables depend on it, including variables such as | 5708 # Xcode variables depend on it, including variables such as |
| 5685 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5709 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5686 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5710 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5687 # files to appear (when present) in the UI as actual files and not red | 5711 # files to appear (when present) in the UI as actual files and not red |
| 5688 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5712 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5689 # and therefore SYMROOT, needs to be set at the project level. | 5713 # and therefore SYMROOT, needs to be set at the project level. |
| 5690 'SYMROOT': '<(DEPTH)/xcodebuild', | 5714 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5691 }, | 5715 }, |
| 5692 } | 5716 } |
| OLD | NEW |