GN bootstrap.py: fixed cross-compile, etc.

tools/gn/bootstrap/bootstrap.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Bootstraps gn.
 
 It is done by first building it manually in a temporary directory, then building
 it with its own BUILD.gn to the final destination.
 """
@@ skipping 89 matching lines @@
   if options.verbose:
     cmd.append('-v')
   cmd.append('gn')
   check_call(cmd)
 
 def write_ninja(path, options):
   cc = os.environ.get('CC', '')
   cxx = os.environ.get('CXX', '')
   cflags = os.environ.get('CFLAGS', '').split()
   cflags_cc = os.environ.get('CXXFLAGS', '').split()
+  ld = os.environ.get('LD', cxx)
   ldflags = os.environ.get('LDFLAGS', '').split()
   include_dirs = [SRC_ROOT]
   libs = []
 
   if is_posix:
     if options.debug:
       cflags.extend(['-O0', '-g'])
     else:
       cflags.extend(['-O2', '-g0'])
 
-    cflags.extend(['-D_FILE_OFFSET_BITS=64 -pthread', '-pipe'])
+    cflags.extend(['-D_FILE_OFFSET_BITS=64', '-pthread', '-pipe'])
     cflags_cc.extend(['-std=gnu++11', '-Wno-c++11-narrowing'])
 
   static_libraries = {
       'base': {'sources': [], 'tool': 'cxx'},
       'dynamic_annotations': {'sources': [], 'tool': 'cc'},
       'gn': {'sources': [], 'tool': 'cxx'},
   }
 
   for name in os.listdir(GN_ROOT):
     if not name.endswith('.cc'):
       continue
     if name.endswith('_unittest.cc'):
       continue
-    if name in ['generate_test_gn_data.cc']:
+    if name in ['generate_test_gn_data.cc', 'run_all_unittests.cc']:
       continue
     full_path = os.path.join(GN_ROOT, name)
     static_libraries['gn']['sources'].append(
         os.path.relpath(full_path, SRC_ROOT))
 
   static_libraries['dynamic_annotations']['sources'].extend([
       'base/third_party/dynamic_annotations/dynamic_annotations.c',
   ])
   static_libraries['base']['sources'].extend([
       'base/at_exit.cc',
@@ skipping 225 matching lines @@
     libs.extend([
         '-framework', 'AppKit',
         '-framework', 'CoreFoundation',
         '-framework', 'Foundation',
         '-framework', 'Security',
     ]);
 
   ninja_lines.extend([
       'build gn: link %s' % (
           ' '.join(['%s.a' % library for library in static_libraries])),
-      '  ld = $ldxx',
       '  ldflags = %s' % ' '.join(ldflags),
       '  libs = %s' % ' '.join(libs),
-      '',  # Make sure the file ends with a newline.
   ])
+  if ld:
+    ninja_lines.append('  ld = %s' % ld)
+  else:
+    ninja_lines.append('  ld = $ldxx')
+
+  ninja_lines.append('')  # Make sure the file ends with a newline.
 
   with open(path, 'w') as f:
     f.write(ninja_template + '\n'.join(ninja_lines))
 
 
 def build_gn_with_gn(temp_gn, build_dir, options):
   cmd = [temp_gn, 'gen', build_dir]
   if not options.debug:
     cmd.append('--args=is_debug=false')
   check_call(cmd)
 
   cmd = ['ninja', '-C', build_dir]
   if options.verbose:
     cmd.append('-v')
   cmd.append('gn')
   check_call(cmd)
 
   if not debug:
     check_call(['strip', os.path.join(build_dir, 'gn')])
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))