Index: pylib/gyp/generator/make.py |
=================================================================== |
--- pylib/gyp/generator/make.py (revision 1715) |
+++ pylib/gyp/generator/make.py (working copy) |
@@ -166,15 +166,11 @@ |
quiet_cmd_link = LINK($(TOOLSET)) $@ |
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) |
-# TODO(thakis): Find out and document the difference between shared_library and |
-# loadable_module on mac. |
quiet_cmd_solink = SOLINK($(TOOLSET)) $@ |
cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) |
-# TODO(thakis): The solink_module rule is likely wrong. Xcode seems to pass |
-# -bundle -single_module here (for osmesa.so). |
quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ |
-cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) |
+cmd_solink_module = $(LINK.$(TOOLSET)) -bundle $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) |
""" |
LINK_COMMANDS_ANDROID = """\ |