Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: pylib/gyp/generator/make.py

Issue 1319663007: Update gyp LINK_COMMANDS_AIX to support both 32-bit and 64-bit files. (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 Google Inc. All rights reserved. 1 # Copyright (c) 2013 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Notes: 5 # Notes:
6 # 6 #
7 # This is all roughly based on the Makefile system used by the Linux 7 # This is all roughly based on the Makefile system used by the Linux
8 # kernel, but is a non-recursive make -- we put the entire dependency 8 # kernel, but is a non-recursive make -- we put the entire dependency
9 # graph in front of make and let it figure it out. 9 # graph in front of make and let it figure it out.
10 # 10 #
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ 205 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
206 cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSE T)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl ,--end-group $(LIBS) 206 cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSE T)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl ,--end-group $(LIBS)
207 quiet_cmd_solink_module_host = SOLINK_MODULE($(TOOLSET)) $@ 207 quiet_cmd_solink_module_host = SOLINK_MODULE($(TOOLSET)) $@
208 cmd_solink_module_host = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(T OOLSET)) -Wl,-soname=$(@F) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) 208 cmd_solink_module_host = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(T OOLSET)) -Wl,-soname=$(@F) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS)
209 """ 209 """
210 210
211 211
212 LINK_COMMANDS_AIX = """\ 212 LINK_COMMANDS_AIX = """\
213 quiet_cmd_alink = AR($(TOOLSET)) $@ 213 quiet_cmd_alink = AR($(TOOLSET)) $@
214 cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) 214 cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) -X32_64 crs $@ $(filter %.o,$^)
215 215
216 quiet_cmd_alink_thin = AR($(TOOLSET)) $@ 216 quiet_cmd_alink_thin = AR($(TOOLSET)) $@
217 cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) 217 cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) -X32_64 crs $@ $(filter %.o,$^)
218 218
219 quiet_cmd_link = LINK($(TOOLSET)) $@ 219 quiet_cmd_link = LINK($(TOOLSET)) $@
220 cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_IN PUTS) $(LIBS) 220 cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_IN PUTS) $(LIBS)
221 221
222 quiet_cmd_solink = SOLINK($(TOOLSET)) $@ 222 quiet_cmd_solink = SOLINK($(TOOLSET)) $@
223 cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) 223 cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS)
224 224
225 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ 225 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
226 cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSE T)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) 226 cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSE T)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS)
227 """ 227 """
(...skipping 1972 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 root_makefile.write("endif\n") 2200 root_makefile.write("endif\n")
2201 root_makefile.write('\n') 2201 root_makefile.write('\n')
2202 2202
2203 if (not generator_flags.get('standalone') 2203 if (not generator_flags.get('standalone')
2204 and generator_flags.get('auto_regeneration', True)): 2204 and generator_flags.get('auto_regeneration', True)):
2205 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files) 2205 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
2206 2206
2207 root_makefile.write(SHARED_FOOTER) 2207 root_makefile.write(SHARED_FOOTER)
2208 2208
2209 root_makefile.close() 2209 root_makefile.close()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698