diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 07:46:24 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 07:46:24 +0000 |
| commit | 1ffb6506c946b7cac6de9cba2b1ca1c77b910fe2 (patch) | |
| tree | b54e1ef2ffa28efa89dbbf73c40f1d69c17bb24d /build/common.gypi | |
| parent | c5854c9e4d566af2d45185ad3ed984af4a4d8f16 (diff) | |
| download | chromium_src-1ffb6506c946b7cac6de9cba2b1ca1c77b910fe2.zip chromium_src-1ffb6506c946b7cac6de9cba2b1ca1c77b910fe2.tar.gz chromium_src-1ffb6506c946b7cac6de9cba2b1ca1c77b910fe2.tar.bz2 | |
Use a variable to control the value of LinkIncremental on Debug
builds, so we can force it off when building the locale .dll files.
Ignore gyp-generated locales.sln file.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index aeedd09..dfd8a5c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -50,6 +50,13 @@ # Once all vsprops settings are migrated into gyp, this can go away. 'msvs_use_common_release%': 1, + # TODO(sgk): eliminate this if possible. + # It would be nicer to support this via a setting in 'target_defaults' + # in chrome/app/locales/locales.gypi overriding the setting in the + # 'Debug' configuration in the 'target_defaults' dict below, + # but that doesn't work as we'd like. + 'msvs_debug_link_incremental%': '2', + # The architecture that we're building on. 'target_arch%': 'ia32', @@ -130,7 +137,7 @@ 'RuntimeLibrary': '1', }, 'VCLinkerTool': { - 'LinkIncremental': '2', + 'LinkIncremental': '<(msvs_debug_link_incremental)', }, 'VCResourceCompilerTool': { 'PreprocessorDefinitions': ['_DEBUG'], |