GN: Fix bootstrap.py on mac

tools/gn/bootstrap/bootstrap.py

Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index f1988331b3a998a8d917835e9a5ec92cb70155a9..81d5b8b4935fdb75de444cd104e9370775829e5b 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -118,10 +118,11 @@ def build_gn_with_ninja_manually(tempdir, options):
   root_gen_dir = os.path.join(tempdir, 'gen')
   mkdir_p(root_gen_dir)
 
-  if is_linux:
+  if is_posix:

[brettw, 2016/04/20 17:21:45]

Actually I think this file should always be generated. We don't currently use it
on Windows I guess, but that seems incidental. Can you just delete the "if" line
and un-dent the block?

     mkdir_p(os.path.join(root_gen_dir, 'base', 'allocator'))
     with tempfile.NamedTemporaryFile() as f:
-      f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=true')
+      f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=%s'
+              % ('true' if is_linux else 'false'))
       f.flush()
 
       check_call([
@@ -198,8 +199,8 @@ def write_ninja(path, root_gen_dir, options):
       'base/third_party/superfasthash/superfasthash.c',
   ])
   static_libraries['base']['sources'].extend([
+      'base/allocator/allocator_check.cc',
       'base/allocator/allocator_extension.cc',
-      'base/allocator/allocator_shim.cc',
       'base/at_exit.cc',
       'base/base_paths.cc',
       'base/base_switches.cc',
@@ -385,6 +386,7 @@ def write_ninja(path, root_gen_dir, options):
         'tool': 'cxx',
     }
     static_libraries['base']['sources'].extend([
+        'base/allocator/allocator_shim.cc',
         'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
         'base/memory/shared_memory_posix.cc',
         'base/nix/xdg_util.cc',