OLD | NEW |
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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': { | 9 'variables': { |
10 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 'configurations': { | 347 'configurations': { |
348 # VCLinkerTool LinkIncremental values below: | 348 # VCLinkerTool LinkIncremental values below: |
349 # 0 == default | 349 # 0 == default |
350 # 1 == /INCREMENTAL:NO | 350 # 1 == /INCREMENTAL:NO |
351 # 2 == /INCREMENTAL | 351 # 2 == /INCREMENTAL |
352 # Debug links incremental, Release does not. | 352 # Debug links incremental, Release does not. |
353 'Debug': { | 353 'Debug': { |
354 'xcode_settings': { | 354 'xcode_settings': { |
355 'COPY_PHASE_STRIP': 'NO', | 355 'COPY_PHASE_STRIP': 'NO', |
356 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', | 356 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', |
357 'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ], | 357 'OTHER_CFLAGS': [ |
| 358 '-fstack-protector', |
| 359 '-fstack-protector-all', |
| 360 '<@(debug_extra_cflags)', |
| 361 ], |
358 }, | 362 }, |
359 'conditions': [ | 363 'conditions': [ |
360 [ 'OS=="win"', { | 364 [ 'OS=="win"', { |
361 'configuration_platform': 'Win32', | 365 'configuration_platform': 'Win32', |
362 'msvs_configuration_attributes': { | 366 'msvs_configuration_attributes': { |
363 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 367 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
364 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 368 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
365 'CharacterSet': '1', | 369 'CharacterSet': '1', |
366 }, | 370 }, |
367 'msvs_settings': { | 371 'msvs_settings': { |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 # and therefore SYMROOT, needs to be set at the project level. | 933 # and therefore SYMROOT, needs to be set at the project level. |
930 'SYMROOT': '<(DEPTH)/xcodebuild', | 934 'SYMROOT': '<(DEPTH)/xcodebuild', |
931 }, | 935 }, |
932 } | 936 } |
933 | 937 |
934 # Local Variables: | 938 # Local Variables: |
935 # tab-width:2 | 939 # tab-width:2 |
936 # indent-tabs-mode:nil | 940 # indent-tabs-mode:nil |
937 # End: | 941 # End: |
938 # vim: set expandtab tabstop=2 shiftwidth=2: | 942 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |