diff options
Diffstat (limited to 'build/internal')
| -rw-r--r-- | build/internal/essential.scons | 6 | ||||
| -rw-r--r-- | build/internal/release_defaults.scons | 14 | ||||
| -rw-r--r-- | build/internal/release_impl_dom_stats.scons | 10 | ||||
| -rw-r--r-- | build/internal/release_impl_official.scons | 6 | ||||
| -rw-r--r-- | build/internal/release_impl_purify.scons | 12 |
5 files changed, 36 insertions, 12 deletions
diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 20dfdbb..1b5ddf3 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -12,6 +12,12 @@ env.Append( CPPPATH = [ '$CHROME_SRC_DIR', ], + CCFLAGS = [ + '$CHROMIUM_CC_OPT_FLAGS', + ], + LINKFLAGS = [ + '$CHROMIUM_LINK_OPT_FLAGS', + ], ) if env['PLATFORM'] == 'win32': diff --git a/build/internal/release_defaults.scons b/build/internal/release_defaults.scons index 817dec2..612bcbc 100644 --- a/build/internal/release_defaults.scons +++ b/build/internal/release_defaults.scons @@ -21,15 +21,21 @@ env.Append( ) if env.Bit('windows'): + env.Replace( + CHROMIUM_CC_OPT_FLAGS = [ + '/O2', # VCCLCompilerTool.Optimization="2" + ], + CHROMIUM_LINK_OPT_FLAGS = [ + '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" + '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" + '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" + ], + ), env.Append( CCFLAGS = [ - '/O2', # VCCLCompilerTool.Optimization="2" '/GF', # VCCLCompilerTool.StringPooling="true" ], LINKFLAGS = [ '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:ICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" ], ) diff --git a/build/internal/release_impl_dom_stats.scons b/build/internal/release_impl_dom_stats.scons index 492e56f..d878592 100644 --- a/build/internal/release_impl_dom_stats.scons +++ b/build/internal/release_impl_dom_stats.scons @@ -18,14 +18,18 @@ env.Append( ) if env['PLATFORM'] == 'win32': + 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-', ] LINKFLAGS = [ '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:ICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" ], ) diff --git a/build/internal/release_impl_official.scons b/build/internal/release_impl_official.scons index 982f0636..cb6921f 100644 --- a/build/internal/release_impl_official.scons +++ b/build/internal/release_impl_official.scons @@ -11,12 +11,16 @@ Import("env") env.ApplySConscript(['release_defaults.scons']) if env.Bit('windows'): + env.Replace( + CHROMIUM_CC_OPT_FLAGS = [ + '/Ox', # VCCLCompilerTool.Optimization="3" + ], + ), env.Append( ARFLAGS = [ '/ltcg', ], CCFLAGS = [ - '/Ox', # VCCLCompilerTool.Optimization="3" '/Ob2', # VCCLCompilerTool.InlineFunctionExpansion="2" '/Oi', # VCCLCompilerTool.EnableIntrinsicFunctions="true" '/Os', # VCCLCompilerTool.FavorSizeOrSpeed="2" diff --git a/build/internal/release_impl_purify.scons b/build/internal/release_impl_purify.scons index 1a03948..912f555 100644 --- a/build/internal/release_impl_purify.scons +++ b/build/internal/release_impl_purify.scons @@ -17,13 +17,17 @@ env.Append( ) if env.Bit('windows'): + env.Replace( + CHROMIUM_CC_OPT_FLAGS = [ + '/Od', # VCCLCompilerTool.Optimization="0" + ], + CHROMIUM_LINK_OPT_FLAGS = [ + '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" + ], + ), env.Append( CCFLAGS = [ - '/Od', # VCCLCompilerTool.Optimization="0" '/MT', # VCCLCompilerTool.RuntimeLibrary="0" '/GS-', # VCCLCompilerTool.BufferSecurityCheck="false" - ] - LINKFLAGS = [ - '/OPT:ICF', # VCLinkerTool.EnableCOMDATFolding="1" ], ) |