diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 07:36:03 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 07:36:03 +0000 |
| commit | 527c739c43984bc49da5d0de4989e1d81d4a74d5 (patch) | |
| tree | d285aee08646c31b345760eb6e936f11271b8f10 /build/debug.scons | |
| parent | 7ae14832d77548f53270fd8c207811114a78bded (diff) | |
| download | chromium_src-527c739c43984bc49da5d0de4989e1d81d4a74d5.zip chromium_src-527c739c43984bc49da5d0de4989e1d81d4a74d5.tar.gz chromium_src-527c739c43984bc49da5d0de4989e1d81d4a74d5.tar.bz2 | |
Fixes and enhancements
* Configurable CHROME_BUILD_TYPE command line or external environment
variable for selecting appropriate release_impl*.scons settings
(_checksenabled, _coverage, _dom_stats, _official, _purify).
* Configurable CHROMIUM_BUILD command line or external environment
variable for selecting appropriate chromium_build*.scons settings
(_google_chrome).
* Configurable /INCREMENTAL linking via command line or external
environment variable ($INCREMENTAL), through appropriate setting
of an internal $CHROMIUM_INCREMENTAL_FLAGS construction variable.
* Full link of release builds by default.
* Alphabetize *.scons files in the mac_env.FilterOut() list.
* Explicitly set _checksenabled.scons link flags.
Review URL: http://codereview.chromium.org/13039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/debug.scons')
| -rw-r--r-- | build/debug.scons | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/debug.scons b/build/debug.scons index f056fcd..4cf6bf8 100644 --- a/build/debug.scons +++ b/build/debug.scons @@ -22,6 +22,12 @@ env.Append( ) if env['PLATFORM'] == 'win32': + if env.get('INCREMENTAL') is None: + # INCREMENTAL was not specified on the command line or in the + # external environment; debug default is incremental link. + env['INCREMENTAL'] = True + env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' + env.Append( CCFLAGS = [ '/Od', # VCCLCompilerTool.Optimization="0" @@ -29,7 +35,6 @@ if env['PLATFORM'] == 'win32': '/MTd', # VCCLCompilerTool.RuntimeLibrary="1" ], LINKFLAGS = [ - '/INCREMENTAL', # VCLinkerTool.LinkIncremental="2" '/DEBUG', ], ) |