Index: pylib/gyp/generator/make.py |
diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py |
index 8cdf7182904f3643e17a5470ebd179b0700988d2..77a5835100bb55cc15eb976bedfbde4d4c1f41a0 100644 |
--- a/pylib/gyp/generator/make.py |
+++ b/pylib/gyp/generator/make.py |
@@ -201,6 +201,24 @@ cmd_solink_module_host = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(T |
""" |
+LINK_COMMANDS_AIX = """\ |
+quiet_cmd_alink = AR($(TOOLSET)) $@ |
+cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) |
+ |
+quiet_cmd_alink_thin = AR($(TOOLSET)) $@ |
+cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) |
+ |
+quiet_cmd_link = LINK($(TOOLSET)) $@ |
+cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) |
+ |
+quiet_cmd_solink = SOLINK($(TOOLSET)) $@ |
+cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) |
+ |
+quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ |
+cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) |
+""" |
+ |
+ |
# Header of toplevel Makefile. |
# This should go into the build tree, but it's easier to keep it here for now. |
SHARED_HEADER = ("""\ |
@@ -1995,6 +2013,12 @@ def GenerateOutput(target_list, target_dicts, data, params): |
header_params.update({ |
'flock': 'lockf', |
}) |
+ elif flavor == 'aix': |
+ header_params.update({ |
+ 'link_commands': LINK_COMMANDS_AIX, |
+ 'flock': './gyp-aix-tool flock', |
+ 'flock_index': 2, |
+ }) |
header_params.update({ |
'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'), |