diff options
| author |  bsalomon <bsalomon@google.com> | 2014-06-26 12:56:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-26 12:56:28 -0700 |
| commit | da07a083676f451499d9ea37881874f926e9d6be (patch) | |
| tree | df41b6327d3f7e437543147ce6468f4d9cf5ec35 | |
| parent | 3512eda332f3a48ab750a047027e2e254ab53a15 (diff) | |
Make LTCG optional on windows builds.
R=mtklein@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/335123010
| -rw-r--r-- | gyp/common_conditions.gypi | 22 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 1 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index ed54a58feb..17eeb78ec5 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -86,7 +86,6 @@ 'VCCLCompilerTool': { 'DebugInformationFormat': '3', # programDatabase (/Zi) 'Optimization': '<(skia_release_optimization_level)', - 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images #'FloatingPointModel': '2', # fast (/fp:fast) 'FavorSizeOrSpeed': '1', # speed (/Ot) @@ -97,10 +96,6 @@ }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG - 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG - }, - 'VCLibrarianTool': { - 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG }, }, }, @@ -154,6 +149,23 @@ }, }, }], + [ 'skia_win_ltcg', { + 'configurations': { + 'Release': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WholeProgramOptimization': 'true', #/GL + }, + 'VCLinkerTool': { + 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG + }, + 'VCLibrarianTool': { + 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG + }, + }, + }, + }, + }], ], }, ], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index c414c75e63..308c7d39e1 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -214,6 +214,7 @@ 'skia_directwrite%': '<(skia_directwrite)', 'skia_gpu%': '<(skia_gpu)', 'skia_win_exceptions%': 0, + 'skia_win_ltcg%': 1, 'skia_osx_deployment_target%': '<(skia_osx_deployment_target)', 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_shared_lib%': '<(skia_shared_lib)', |