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/internal | |
| 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/internal')
| -rw-r--r-- | build/internal/essential.scons | 7 | ||||
| -rw-r--r-- | build/internal/release_defaults.scons | 6 | ||||
| -rw-r--r-- | build/internal/release_impl_checksenabled.scons | 10 |
3 files changed, 20 insertions, 3 deletions
diff --git a/build/internal/essential.scons b/build/internal/essential.scons index e2ffc53..56770d9 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -17,10 +17,17 @@ env.Append( ], LINKFLAGS = [ '$CHROMIUM_LINK_OPT_FLAGS', + '$CHROMIUM_INCREMENTAL_FLAGS', ], ) if env['PLATFORM'] == 'win32': + incremental = env.get('INCREMENTAL') + if incremental is not None: + if incremental: + env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' + else: + env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' env.Append( ARFLAGS = [ '/ignore:4221', diff --git a/build/internal/release_defaults.scons b/build/internal/release_defaults.scons index 612bcbc..5d36cf1 100644 --- a/build/internal/release_defaults.scons +++ b/build/internal/release_defaults.scons @@ -21,6 +21,12 @@ env.Append( ) if env.Bit('windows'): + if env.get('INCREMENTAL') is None: + # INCREMENTAL was not specified on the command line or in the + # external environment; release default is full link. + env['INCREMENTAL'] = False + env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' + env.Replace( CHROMIUM_CC_OPT_FLAGS = [ '/O2', # VCCLCompilerTool.Optimization="2" diff --git a/build/internal/release_impl_checksenabled.scons b/build/internal/release_impl_checksenabled.scons index 0bdab12..c0b4993 100644 --- a/build/internal/release_impl_checksenabled.scons +++ b/build/internal/release_impl_checksenabled.scons @@ -19,6 +19,13 @@ env.Append( ) if env.Bit('windows'): + env.Replace( + CHROMIUM_LINK_OPT_FLAGS = [ + '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" + '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" + '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" + ], + ), env.Append( CCFLAGS = [ '/Oy-', @@ -26,8 +33,5 @@ if env.Bit('windows'): ], LINKFLAGS = [ '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:ICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" ], ) |