Browse Source

gyp: Apply 'argument too long' fix in another place

For some reason, aa5961a445 caused
'make test' to rebuild the entire project every time.  Applying
the fix to the other place where gyp chops up the argument list
makes it behave properly.
v0.9.1-release
isaacs 13 years ago
parent
commit
04271a5e93
  1. 6
      tools/gyp/pylib/gyp/generator/make.py

6
tools/gyp/pylib/gyp/generator/make.py

@ -2128,10 +2128,10 @@ def GenerateOutput(target_list, target_dicts, data, params):
if generator_flags.get('auto_regeneration', True):
WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
# Write the rule to load dependencies. We batch 1000 files at a time to
# Write the rule to load dependencies. We batch 512 files at a time to
# avoid overflowing the command line.
all_deps = ""
for i in range(1001, num_outputs, 1000):
for i in range(513, num_outputs, 512):
all_deps += ("""
ifneq ($(word %(start)d,$(d_files)),)
$(shell cat $(wordlist %(start)d,%(end)d,$(d_files)) >> $(depsdir)/all.deps)
@ -2142,7 +2142,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
ifneq ($(word %(last)d,$(d_files)),)
$(error Found unprocessed dependency files (gyp didn't generate enough rules!))
endif
""" % { 'last': ((num_outputs / 1000) + 1) * 1000 + 1 }
""" % { 'last': ((num_outputs / 512) + 1) * 512 + 1 }
root_makefile.write(SHARED_FOOTER % { 'generate_all_deps': all_deps })

Loading…
Cancel
Save