Make no-tcmalloc (really, non-base/allocator) builds work again,...

build/common.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 109 matching lines @@
     # Set to 1 to enable code coverage.  In addition to build changes
     # (e.g. extra CFLAGS), also creates a new target in the src/chrome
     # project file called "coverage".
     # Currently ignored on Windows.
     'coverage%': 0,
 
     # Overridable specification for potential use of alternative
     # JavaScript engines.
     'javascript_engine%': 'v8',
 
+    # Although base/allocator lets you select a heap library via an 
+    # environment variable, the libcmt shim it uses sometimes gets in
+    # the way.  To disable it entirely, and switch to normal msvcrt, do e.g.
+    #  'win_use_allocator_shim': 0,
+    #  'win_release_RuntimeLibrary': 2
+    # to ~/.gyp/include.gypi, gclient runhooks --force, and do a release build.
+    'win_use_allocator_shim%': 1, # 0 = shim allocator via libcmt; 1 = msvcrt
+
     # To do a shared build on linux we need to be able to choose between type
     # static_library and shared_library. We default to doing a static build
     # but you can override this with "gyp -Dlibrary=shared_library" or you
     # can add the following line (without the #) to ~/.gyp/include.gypi
     # {'variables': {'library': 'shared_library'}}
     # to compile as shared by default
     'library%': 'static_library',
 
     # The Google Update appid.
     'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
@@ skipping 133 matching lines @@
       'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
       'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he',
       'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv',
       'ml', 'mr', 'nb', 'nl', 'or', 'pl', 'pt-BR', 'pt-PT', 'ro',
       'ru', 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr',
       'uk', 'vi', 'zh-CN', 'zh-TW',
     ],
   },
   'target_defaults': {
     'variables': {
+      # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html
       'mac_release_optimization%': '3', # Use -O3 unless overridden
       'mac_debug_optimization%': '0',   # Use -O0 unless overridden
+      # See http://msdn.microsoft.com/en-us/library/aa652360(VS.71).aspx
+      'win_release_Optimization%': '2', # 2 = /Os
+      'win_debug_Optimization%': '0',   # 0 = /Od
+      # See http://msdn.microsoft.com/en-us/library/aa652367(VS.71).aspx
+      'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
+      'win_debug_RuntimeLibrary%': '1',   # 1 = /MTd (debug static)
+
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
       'release_valgrind_build%': 0,
     },
     'conditions': [
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
@@ skipping 23 matching lines @@
               'VCCLCompilerTool': {
                 'DebugInformationFormat': '0',
               }
             }
          }],  # OS==win
         ],  # conditions for fastbuild.
       }],  # fastbuild!=0
       ['selinux==1', {
         'defines': ['CHROMIUM_SELINUX=1'],
       }],
+      ['win_use_allocator_shim==0', {
+        'conditions': [
+          ['OS=="win"', {
+            'defines': ['NO_TCMALLOC'],
+          }],
+        ],
+      }],
       ['coverage!=0', {
         'conditions': [
           ['OS=="mac"', {
             'xcode_settings': {
               'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES',  # -fprofile-arcs
               'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES',  # -ftest-coverage
             },
             # Add -lgcov for executables and shared_libraries, not for
             # static_libraries.  This is a delayed conditional.
             'target_conditions': [
@@ skipping 44 matching lines @@
       },
       'Debug': {
         'inherit_from': ['Common'],
         'xcode_settings': {
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
           'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ],
         },
         'msvs_settings': {
           'VCCLCompilerTool': {
-            'Optimization': '0',
+            'Optimization': '<(win_debug_Optimization)',
             'PreprocessorDefinitions': ['_DEBUG'],
             'BasicRuntimeChecks': '3',
-            'RuntimeLibrary': '1',
+            'RuntimeLibrary': '<(win_debug_RuntimeLibrary)',
           },
           'VCLinkerTool': {
             'LinkIncremental': '<(msvs_debug_link_incremental)',
           },
           'VCResourceCompilerTool': {
             'PreprocessorDefinitions': ['_DEBUG'],
           },
         },
         'conditions': [
           ['OS=="linux"', {
             'cflags': [
               '<@(debug_extra_cflags)',
             ],
           }],
         ],
       },
       'Release': {
         'inherit_from': ['Common'],
         'defines': [
           'NDEBUG',
         ],
         'xcode_settings': {
           'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip
           'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)',
           'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ],
         },
         'msvs_settings': {
+          'VCCLCompilerTool': {
+            'Optimization': '<(win_release_Optimization)',
+            'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
+          },
           'VCLinkerTool': {
             'LinkIncremental': '1',
           },
         },
         'conditions': [
           ['release_valgrind_build==0', {
             'defines': ['NVALGRIND'],
           }],
+          ['win_use_allocator_shim==0', {
+            'defines': ['NO_TCMALLOC'],
+          }],
+          ['win_release_RuntimeLibrary==2', {
+            # Visual C++ 2008 barfs when building anything with /MD (msvcrt):
+            #  VC\include\typeinfo(139) : warning C4275: non dll-interface 
+            #  class 'stdext::exception' used as base for dll-interface 
+            #  class 'std::bad_cast'
+            'msvs_disabled_warnings': [4275],
+          }],
           ['msvs_use_common_release', {
             'msvs_props': ['release.vsprops'],
           }],
           ['OS=="linux"', {
             'cflags': [
              '<@(release_extra_cflags)',
             ],
           }],
         ],
       },
@@ skipping 11 matching lines @@
                 'Optimization': '0',
                 'RuntimeLibrary': '0',
                 'BufferSecurityCheck': 'false',
               },
               'VCLinkerTool': {
                 'EnableCOMDATFolding': '1',
                 'LinkIncremental': '1',
               },
             },
           },
-          'Release - no tcmalloc': {
-            'inherit_from': ['Release'],
-            'defines': ['NO_TCMALLOC'],
-          },
           'Debug_x64': {
             'inherit_from': ['Debug'],
             'msvs_configuration_platform': 'x64',
           },
           'Release_x64': {
             'inherit_from': ['Release'],
             'msvs_configuration_platform': 'x64',
           },
           'Purify_x64': {
             'inherit_from': ['Purify'],
             'msvs_configuration_platform': 'x64',
           },
-          'Release - no tcmalloc_x64': {
-            'inherit_from': ['Release - no tcmalloc'],
-            'msvs_configuration_platform': 'x64',
-          },
         }],
       ],
     },
   },
   'conditions': [
     ['OS=="linux"', {
       'target_defaults': {
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
@@ skipping 516 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: