ninja&make/mac: Give loadable_modules type MH_BUNDLE.

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import hashlib
 import multiprocessing
 import os.path
 import re
 import signal
@@ skipping 1625 matching lines @@
     # Chromium's ffmpeg c99conv.py currently looks for a 'cc =' line in
     # build.ninja so needs something valid here. http://crbug.com/233985
     cc = 'cl.exe'
     cxx = 'cl.exe'
     ld = 'link.exe'
     ld_host = '$ld'
   else:
     cc = 'gcc'
     cxx = 'g++'
     ld = '$cxx'
+    ld_c = '$cc'
     ld_host = '$cxx_host'
 
   cc_host = None
   cxx_host = None
   cc_host_global_setting = None
   cxx_host_global_setting = None
 
   build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0])
   make_global_settings = data[build_file].get('make_global_settings', [])
   build_to_root = gyp.common.InvertRelativePath(build_dir,
@@ skipping 232 matching lines @@
               './gyp-mac-tool filter-libtool libtool $libtool_flags '
               '-static -o $out $in'
               '$postbuilds')
     master_ninja.rule(
       'lipo',
       description='LIPO $out, POSTBUILDS',
       command='rm -f $out && lipo -create $in -output $out$postbuilds')
 
     # Record the public interface of $lib in $lib.TOC. See the corresponding
     # comment in the posix section above for details.
-    solink_base = '$ld -shared $ldflags -o $lib %(suffix)s'
+    solink_base = '$ld %(type)s $ldflags -o $lib %(suffix)s'
     mtime_preserving_solink_base = (
         'if [ ! -e $lib -o ! -e ${lib}.TOC ] || '
              # Always force dependent targets to relink if this library
              # reexports something. Handling this correctly would require
              # recursive TOC dumping but this is rare in practice, so punt.
              'otool -l $lib | grep -q LC_REEXPORT_DYLIB ; then '
           '%(solink)s && %(extract_toc)s > ${lib}.TOC; '
         'else '
           '%(solink)s && %(extract_toc)s > ${lib}.tmp && '
           'if ! cmp -s ${lib}.tmp ${lib}.TOC; then '
             'mv ${lib}.tmp ${lib}.TOC ; '
           'fi; '
         'fi'
         % { 'solink': solink_base,
             'extract_toc':
               '{ otool -l $lib | grep LC_ID_DYLIB -A 5; '
               'nm -gP $lib | cut -f1-2 -d\' \' | grep -v U$$; true; }'})
 
-    # TODO(thakis): The solink_module rule is likely wrong. Xcode seems to pass
-    # -bundle -single_module here (for osmesa.so).
     solink_suffix = '$in $solibs $libs$postbuilds'
     master_ninja.rule(
       'solink',
       description='SOLINK $lib, POSTBUILDS',
       restat=True,
-      command=mtime_preserving_solink_base % {'suffix':solink_suffix},
+      command=mtime_preserving_solink_base % {'suffix': solink_suffix,
+                                              'type': '-shared'},
       pool='link_pool')
     master_ninja.rule(
       'solink_notoc',
       description='SOLINK $lib, POSTBUILDS',
       restat=True,
-      command=solink_base % {'suffix':solink_suffix},
+      command=solink_base % {'suffix':solink_suffix, 'type': '-shared'},

[Mark Mentovai, 2013/09/05 14:29:37]

Missing space before solink_suffix?

       pool='link_pool')
 
     solink_module_suffix = '$in $solibs $libs$postbuilds'
     master_ninja.rule(
       'solink_module',
       description='SOLINK(module) $lib, POSTBUILDS',
       restat=True,
-      command=mtime_preserving_solink_base % {'suffix':solink_module_suffix},
+      command=mtime_preserving_solink_base % {'suffix': solink_module_suffix,
+                                              'type': '-bundle'},
       pool='link_pool')
     master_ninja.rule(
       'solink_module_notoc',
       description='SOLINK(module) $lib, POSTBUILDS',
       restat=True,
-      command=solink_base % {'suffix':solink_module_suffix},
+      command=solink_base % {'suffix': solink_module_suffix, 'type': '-bundle'},
       pool='link_pool')
 
     master_ninja.rule(
       'link',
       description='LINK $out, POSTBUILDS',
       command=('$ld $ldflags -o $out '
                '$in $solibs $libs$postbuilds'),
       pool='link_pool')
     master_ninja.rule(
       'infoplist',
@@ skipping 131 matching lines @@
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)